diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-21 17:29:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 17:29:45 +0200 |
| commit | d723e5a62ff10d338b8a2848e5a7a43a81233c24 (patch) | |
| tree | 96b4aac1dc2795ecb49ecf0c149be43890794e1e /core | |
| parent | 4abc945466c69426cf4c00ab87d61b927ef1639d (diff) | |
| parent | 5c355a63d3a86039a8f1a88e6ea508209de97dbc (diff) | |
Merge pull request #5560 from vnen/os-request-attention
Add OS.request_attention() for Windows
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 6 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 1 | ||||
| -rw-r--r-- | core/os/os.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 9cc934bb6f..e56684dc5e 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -944,6 +944,11 @@ void _OS::native_video_stop() { OS::get_singleton()->native_video_stop(); }; +void _OS::request_attention() { + + OS::get_singleton()->request_attention(); +} + bool _OS::is_debug_build() const { #ifdef DEBUG_ENABLED @@ -1042,6 +1047,7 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("is_window_minimized"),&_OS::is_window_minimized); 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("request_attention"), &_OS::request_attention); ObjectTypeDB::bind_method(_MD("set_borderless_window", "borderless"), &_OS::set_borderless_window); ObjectTypeDB::bind_method(_MD("get_borderless_window"), &_OS::get_borderless_window); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index b43c5246ed..9ca439a454 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -158,6 +158,7 @@ public: virtual bool is_window_minimized() const; virtual void set_window_maximized(bool p_enabled); virtual bool is_window_maximized() const; + virtual void request_attention(); virtual void set_borderless_window(bool p_borderless); virtual bool get_borderless_window() const; diff --git a/core/os/os.h b/core/os/os.h index 40f3989a55..2521d67e29 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -174,6 +174,7 @@ public: virtual bool is_window_minimized() const { return false; } virtual void set_window_maximized(bool p_enabled) {} virtual bool is_window_maximized() const { return true; } + virtual void request_attention() { } virtual void set_borderless_window(int p_borderless) {} virtual bool get_borderless_window() { return 0; } |