diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-07-04 10:51:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-04 10:51:09 +0200 |
commit | 8ccb1cec915283f538eaf187592b850759a72a7b (patch) | |
tree | f3d64732e78a05712228605d33c457fce30ddef7 /platform/osx/display_server_osx.h | |
parent | 9cec315ec0aeb7a105a9b0828e437b7d508f6dc1 (diff) | |
parent | df968d577ac6d1bca223cdaec83940bfb36ade64 (diff) |
Merge pull request #40084 from bruvzg/macos_seamless_scaling
[macOS] Implement seamless display scaling.
Diffstat (limited to 'platform/osx/display_server_osx.h')
-rw-r--r-- | platform/osx/display_server_osx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h index 8e27f10dc2..3e6b59f58c 100644 --- a/platform/osx/display_server_osx.h +++ b/platform/osx/display_server_osx.h @@ -132,6 +132,7 @@ public: bool on_top = false; bool borderless = false; bool resize_disabled = false; + bool no_focus = false; }; Point2i im_selection; @@ -150,7 +151,6 @@ public: void _set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window); - float _display_scale(id screen) const; Point2i _get_screens_origin() const; Point2i _get_native_screen_position(int p_screen) const; @@ -224,6 +224,7 @@ public: virtual Size2i screen_get_size(int p_screen = SCREEN_OF_MAIN_WINDOW) const; virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const; virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const; + virtual float screen_get_max_scale() const; virtual Rect2i screen_get_usable_rect(int p_screen = SCREEN_OF_MAIN_WINDOW) const; virtual Vector<int> get_window_list() const; |