summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduz@Juans-MBP.fibertel.com.ar>2016-05-30 00:28:29 -0300
committerJuan Linietsky <reduz@Juans-MBP.fibertel.com.ar>2016-05-30 00:28:29 -0300
commit9b1f8230ec435d9289b53afa8da02367daf8b5af (patch)
treecaa9383d77d9865cfa8e41c0ca0e74318d2d9365 /core
parentc7d24b7814b335fb9503f6a957ac5923a47da161 (diff)
-Some fixes to OSX retina scaling for window functions
-Implemented HiDPI detection and support for Godot Editor!
Diffstat (limited to 'core')
-rw-r--r--core/os/os.cpp1
-rw-r--r--core/os/os.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 1aee6d9aa2..6910b368d3 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -548,6 +548,7 @@ OS::OS() {
_render_thread_mode=RENDER_THREAD_SAFE;
_time_scale=1.0;
_pixel_snap=false;
+ _allow_hidpi=true;
Math::seed(1234567);
}
diff --git a/core/os/os.h b/core/os/os.h
index 5fd2bd6c25..76dd235d24 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -60,6 +60,7 @@ class OS {
int _target_fps;
float _time_scale;
bool _pixel_snap;
+ bool _allow_hidpi;
char *last_error;
@@ -418,6 +419,7 @@ public:
virtual void set_context(int p_context);
+ bool is_hidpi_allowed() const { return _allow_hidpi; }
OS();
virtual ~OS();