LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added opt-in support for high-dpi mode in OS X when on a retina display (resolves issue #761).

Browse Source 
Added a ‘highdpi’ boolean flag to t.window/love.window.setMode (defaults to false.)
When the window is actually in high-dpi mode on a supported display, the graphics width and height and the mouse position are in pixels, rather than ‘window coordinates’.

Added love.window.getPixelScale. Returns the scale factor of the window from user-space points to pixels (e.g. it will be 1 normally, and 2 on a retina display in OS X with high-dpi mode enabled.)
This commit is contained in:
Alex Szpakowski
2014-01-17 21:11:20 -04:00
parent 29f47d9a10
commit 309193895a
10 changed files with 308 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/Window.h
+29 -23
View File
@@ -37,26 +37,27 @@ namespace window
// Forward-declared so it can be used in the class methods. We can't define the
// whole thing here because it uses the Window::Type enum.
struct WindowAttributes;
struct WindowSettings;
class Window : public Module
{
public:
// Types of window attributes.
enum Attribute
// Different window settings.
enum Setting
{
ATTRIB_FULLSCREEN,
ATTRIB_FULLSCREEN_TYPE,
ATTRIB_VSYNC,
ATTRIB_FSAA,
ATTRIB_RESIZABLE,
ATTRIB_MIN_WIDTH,
ATTRIB_MIN_HEIGHT,
ATTRIB_BORDERLESS,
ATTRIB_CENTERED,
ATTRIB_DISPLAY,
ATTRIB_MAX_ENUM
SETTING_FULLSCREEN,
SETTING_FULLSCREEN_TYPE,
SETTING_VSYNC,
SETTING_FSAA,
SETTING_RESIZABLE,
SETTING_MIN_WIDTH,
SETTING_MIN_HEIGHT,
SETTING_BORDERLESS,
SETTING_CENTERED,
SETTING_DISPLAY,
SETTING_HIGHDPI,
SETTING_MAX_ENUM
};
enum FullscreenType
@@ -74,8 +75,8 @@ public:
virtual ~Window();
virtual bool setWindow(int width = 800, int height = 600, WindowAttributes *attribs = 0) = 0;
virtual void getWindow(int &width, int &height, WindowAttributes &attribs) = 0;
virtual bool setWindow(int width = 800, int height = 600, WindowSettings *settings = nullptr) = 0;
virtual void getWindow(int &width, int &height, WindowSettings &settings) = 0;
virtual bool setFullscreen(bool fullscreen, FullscreenType fstype) = 0;
virtual bool setFullscreen(bool fullscreen) = 0;
@@ -113,14 +114,16 @@ public:
virtual void setMouseGrab(bool grab) = 0;
virtual bool isMouseGrabbed() const = 0;
virtual double getPixelScale() const = 0;
virtual const void *getHandle() const = 0;
//virtual static Window *createSingleton() = 0;
//virtual static Window *getSingleton() = 0;
// No virtual statics, of course, but you are supposed to implement these statics.
static bool getConstant(const char *in, Attribute &out);
static bool getConstant(Attribute in, const char *&out);
static bool getConstant(const char *in, Setting &out);
static bool getConstant(Setting in, const char *&out);
static bool getConstant(const char *in, FullscreenType &out);
static bool getConstant(FullscreenType in, const char *&out);
@@ -131,17 +134,18 @@ protected:
private:
static StringMap<Attribute, ATTRIB_MAX_ENUM>::Entry attributeEntries[];
static StringMap<Attribute, ATTRIB_MAX_ENUM> attributes;
static StringMap<Setting, SETTING_MAX_ENUM>::Entry settingEntries[];
static StringMap<Setting, SETTING_MAX_ENUM> settings;
static StringMap<FullscreenType, FULLSCREEN_TYPE_MAX_ENUM>::Entry fullscreenTypeEntries[];
static StringMap<FullscreenType, FULLSCREEN_TYPE_MAX_ENUM> fullscreenTypes;
}; // Window
struct WindowAttributes
struct WindowSettings
{
WindowAttributes();
WindowSettings();
bool fullscreen; // = false
Window::FullscreenType fstype; // = FULLSCREEN_TYPE_NORMAL
bool vsync; // = true
@@ -152,7 +156,9 @@ struct WindowAttributes
bool borderless; // = false
bool centered; // = true
int display; // = 0
}; // WindowFlags
bool highdpi; // false
}; // WindowSettings
} // window
} // love