diff options
author | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2020-08-21 09:39:30 +0200 |
---|---|---|
committer | PouleyKetchoupp <pouleyketchoup@gmail.com> | 2020-08-22 18:42:42 +0200 |
commit | 2b49cb0b7397e3ba14aede1d6d4d28bf17b816bd (patch) | |
tree | 336c65cef2b18f0468ad97f3c8a88f0b031cac6d /servers | |
parent | b0ca859501186b6fa088a3d3542f7dd4d72ae305 (diff) |
Re-apply "Fixes for windows in X11 tiling WMs"
From PR #38727 which was reverted in #41373 because of regressions in Ubuntu
with Gnome.
Co-authored-by: Lorenzo Cerqua <lorenzocerqua@tutanota.com>
Diffstat (limited to 'servers')
-rw-r--r-- | servers/display_server.cpp | 4 | ||||
-rw-r--r-- | servers/display_server.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/servers/display_server.cpp b/servers/display_server.cpp index 32d4e9e569..8f6d6d3b99 100644 --- a/servers/display_server.cpp +++ b/servers/display_server.cpp @@ -186,6 +186,10 @@ DisplayServer::WindowID DisplayServer::create_sub_window(WindowMode p_mode, uint ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Sub-windows not supported by this display server."); } +void DisplayServer::show_window(WindowID p_id) { + ERR_FAIL_MSG("Sub-windows not supported by this display server."); +} + void DisplayServer::delete_sub_window(WindowID p_id) { ERR_FAIL_MSG("Sub-windows not supported by this display server."); } diff --git a/servers/display_server.h b/servers/display_server.h index fc6520fa5e..b652418244 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -220,6 +220,7 @@ public: }; virtual WindowID create_sub_window(WindowMode p_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i()); + virtual void show_window(WindowID p_id); virtual void delete_sub_window(WindowID p_id); virtual WindowID get_window_at_screen_position(const Point2i &p_position) const = 0; |