diff options
author | Saracen <SaracenOne@gmail.com> | 2016-01-03 04:18:28 +0000 |
---|---|---|
committer | Saracen <SaracenOne@gmail.com> | 2016-03-12 16:38:12 +0000 |
commit | 6eb4812317bc5207444ddbfe887d06969969b669 (patch) | |
tree | 507901307887e4fb93d86917d79a552e264af042 /core | |
parent | 8b1dcbfe4d92f9d7273bbd2f1eb805e5c508961a (diff) |
Borderless window support for the Win32 build. Default window position is now also centred.
Diffstat (limited to 'core')
-rw-r--r-- | core/bind/core_bind.cpp | 12 | ||||
-rw-r--r-- | core/bind/core_bind.h | 2 | ||||
-rw-r--r-- | core/os/os.h | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index d67b93603c..db234484dd 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -260,6 +260,13 @@ bool _OS::is_window_maximized() const { return OS::get_singleton()->is_window_maximized(); } +void _OS::set_borderless_window(bool p_borderless) { + OS::get_singleton()->set_borderless_window(p_borderless); +} + +bool _OS::get_borderless_window() const { + return OS::get_singleton()->get_borderless_window(); +} void _OS::set_use_file_access_save_and_swap(bool p_enable) { @@ -865,6 +872,11 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_window_maximized", "enabled"),&_OS::set_window_maximized); ObjectTypeDB::bind_method(_MD("is_window_maximized"),&_OS::is_window_maximized); + ObjectTypeDB::bind_method(_MD("set_borderless_window", "borderless"), &_OS::set_borderless_window); + ObjectTypeDB::bind_method(_MD("get_borderless_window"), &_OS::get_borderless_window); + ObjectTypeDB::bind_method(_MD("set_multisamples", "multisamples"), &_OS::set_multisamples); + ObjectTypeDB::bind_method(_MD("get_multisamples"), &_OS::get_multisamples); + ObjectTypeDB::bind_method(_MD("set_screen_orientation","orientation"),&_OS::set_screen_orientation); ObjectTypeDB::bind_method(_MD("get_screen_orientation"),&_OS::get_screen_orientation); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 7b3494ebc1..ab11c4804c 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -128,6 +128,8 @@ public: virtual void set_window_maximized(bool p_enabled); virtual bool is_window_maximized() const; + virtual void set_borderless_window(bool p_borderless); + virtual bool get_borderless_window() const; Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track); bool native_video_is_playing(); diff --git a/core/os/os.h b/core/os/os.h index 65ce44465b..73726feb37 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -75,8 +75,9 @@ public: int width,height; bool fullscreen; bool resizable; + bool borderless_window; float get_aspect() const { return (float)width/(float)height; } - VideoMode(int p_width=1024,int p_height=600,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; } + VideoMode(int p_width=1024,int p_height=600,bool p_fullscreen=false, bool p_resizable = true,bool p_borderless_window=false) { width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; borderless_window=p_borderless_window; } }; protected: friend class Main; @@ -172,6 +173,8 @@ public: virtual void set_window_maximized(bool p_enabled) {} virtual bool is_window_maximized() const { return true; } + virtual void set_borderless_window(int p_borderless) {} + virtual bool get_borderless_window() { return 0; } |