diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-09 08:33:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-09 08:33:26 +0100 |
| commit | e7905f4f48c18daa948838549f2846b79d4bd1d4 (patch) | |
| tree | a7e81d1d846ef21c71834fc5290ac9f24303306a /platform/linuxbsd/x11/display_server_x11.h | |
| parent | bb08997b8725780670be30afa96354e7c38586fd (diff) | |
| parent | 2b815df3c19499f9fcf1575cfce1477876030e81 (diff) | |
| download | redot-engine-e7905f4f48c18daa948838549f2846b79d4bd1d4.tar.gz | |
Merge pull request #71045 from reduz/use-bitfield-in-core-types
Use BitField<> in core type masks
Diffstat (limited to 'platform/linuxbsd/x11/display_server_x11.h')
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h index 2fac446fcf..43a66f95b2 100644 --- a/platform/linuxbsd/x11/display_server_x11.h +++ b/platform/linuxbsd/x11/display_server_x11.h @@ -205,7 +205,7 @@ class DisplayServerX11 : public DisplayServer { Point2i last_click_pos = Point2i(-100, -100); uint64_t last_click_ms = 0; MouseButton last_click_button_index = MouseButton::NONE; - MouseButton last_button_state = MouseButton::NONE; + BitField<MouseButtonMask> last_button_state; bool app_focused = false; uint64_t time_since_no_focus = 0; @@ -234,7 +234,7 @@ class DisplayServerX11 : public DisplayServer { Rect2i _screen_get_rect(int p_screen) const; - MouseButton _get_mouse_button_state(MouseButton p_x11_button, int p_x11_type); + BitField<MouseButtonMask> _get_mouse_button_state(MouseButton p_x11_button, int p_x11_type); void _get_key_modifier_state(unsigned int p_x11_state, Ref<InputEventWithModifiers> state); void _flush_mouse_motion(); @@ -344,7 +344,7 @@ public: virtual void warp_mouse(const Point2i &p_position) override; virtual Point2i mouse_get_position() const override; - virtual MouseButton mouse_get_button_state() const override; + virtual BitField<MouseButtonMask> mouse_get_button_state() const override; virtual void clipboard_set(const String &p_text) override; virtual String clipboard_get() const override; |