diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-03 15:56:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-03 15:56:05 +0100 |
| commit | 8791e333da786fbb3645ca999810bbeab37674bb (patch) | |
| tree | a2cd5a19789cd54b64ee1bef0a0a1e1ecff294ab /servers | |
| parent | f0893890e1f4b00c1beb792908b18bf602d686b0 (diff) | |
| parent | f7955633de42d660a24efafdf32b3bd3b72f6251 (diff) | |
Merge pull request #70624 from bruvzg/cur_sc
Improve `window_set_current_screen` and fix secondary window initial mode and positions.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/display_server.cpp | 2 | ||||
| -rw-r--r-- | servers/display_server.h | 2 | ||||
| -rw-r--r-- | servers/display_server_headless.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/servers/display_server.cpp b/servers/display_server.cpp index 523cc714f0..68d625b083 100644 --- a/servers/display_server.cpp +++ b/servers/display_server.cpp @@ -379,7 +379,7 @@ bool DisplayServer::screen_is_kept_on() const { return false; } -DisplayServer::WindowID DisplayServer::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect) { +DisplayServer::WindowID DisplayServer::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, int p_screen) { ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Sub-windows not supported by this display server."); } diff --git a/servers/display_server.h b/servers/display_server.h index 4c36b0acb9..67e7a82e25 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -312,7 +312,7 @@ public: WINDOW_FLAG_EXTEND_TO_TITLE_BIT = (1 << WINDOW_FLAG_EXTEND_TO_TITLE), }; - virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i()); + virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), int p_screen = 0); virtual void show_window(WindowID p_id); virtual void delete_sub_window(WindowID p_id); diff --git a/servers/display_server_headless.h b/servers/display_server_headless.h index 94b5f3c1e9..c4f6c7f165 100644 --- a/servers/display_server_headless.h +++ b/servers/display_server_headless.h @@ -66,7 +66,7 @@ public: Vector<DisplayServer::WindowID> get_window_list() const override { return Vector<DisplayServer::WindowID>(); } - WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i()) override { return 0; } + WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), int p_screen = 0) override { return 0; } void show_window(WindowID p_id) override {} void delete_sub_window(WindowID p_id) override {} |