diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-25 23:02:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-25 23:02:56 +0100 |
| commit | 0393057e36e486b2944e6166e6572327944b2fa7 (patch) | |
| tree | a8c47351e66bcde9b77f72e9b14fe8757891ae9d /platform/linuxbsd/display_server_x11.h | |
| parent | 90d16a32109351dea7684f437436c63cc414f51d (diff) | |
| parent | 74ff5921d68ca09942d8988d5a78849b46d8583b (diff) | |
Merge pull request #58490 from bruvzg/imporve_popup_menu_handling
Diffstat (limited to 'platform/linuxbsd/display_server_x11.h')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/platform/linuxbsd/display_server_x11.h b/platform/linuxbsd/display_server_x11.h index 2d07361deb..63d32d939d 100644 --- a/platform/linuxbsd/display_server_x11.h +++ b/platform/linuxbsd/display_server_x11.h @@ -133,7 +133,6 @@ class DisplayServerX11 : public DisplayServer { ObjectID instance_id; - bool menu_type = false; bool no_focus = false; //better to guess on the fly, given WM can change it @@ -145,12 +144,21 @@ class DisplayServerX11 : public DisplayServer { Vector2i last_position_before_fs; bool focused = true; bool minimized = false; + bool is_popup = false; + + Rect2i parent_safe_rect; unsigned int focus_order = 0; }; Map<WindowID, WindowData> windows; + unsigned int last_mouse_monitor_mask = 0; + Vector2i last_mouse_monitor_pos; + uint64_t time_since_popup = 0; + + List<WindowID> popup_list; + WindowID last_focused_window = INVALID_WINDOW_ID; WindowID window_id_counter = MAIN_WINDOW_ID; @@ -283,6 +291,10 @@ protected: void _window_changed(XEvent *event); public: + void mouse_process_popups(); + void popup_open(WindowID p_window); + void popup_close(WindowID p_window); + virtual bool has_feature(Feature p_feature) const override; virtual String get_name() const override; @@ -317,6 +329,10 @@ public: virtual void show_window(WindowID p_id) override; virtual void delete_sub_window(WindowID p_id) override; + virtual WindowID window_get_active_popup() const override; + virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override; + virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override; + virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override; virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override; |