diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 19:54:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 19:54:19 -0300 |
| commit | 94ee7798ced5bc79196c971921c3109e299f8306 (patch) | |
| tree | e74a933ee4879a742f90aead5fb1001c6531d07a /scene/gui/control.h | |
| parent | 4fd464a4c5fc83c34377450935671b7be868333c (diff) | |
-removed stop mouse and ignore mouse from control, which were confusing, replaced by mouse filter
Diffstat (limited to 'scene/gui/control.h')
| -rw-r--r-- | scene/gui/control.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/scene/gui/control.h b/scene/gui/control.h index fa8e5f22e3..b67e5980c5 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -71,6 +71,12 @@ public: }; + enum MouseFilter { + MOUSE_FILTER_STOP, + MOUSE_FILTER_PASS, + MOUSE_FILTER_IGNORE + }; + enum CursorShape { CURSOR_ARROW, CURSOR_IBEAM, @@ -124,8 +130,7 @@ private: bool pending_min_size_update; Point2 custom_minimum_size; - bool ignore_mouse; - bool stop_mouse; + MouseFilter mouse_filter; bool block_minimum_size_adjust; bool disable_visibility_clip; @@ -337,11 +342,8 @@ public: Control *get_focus_owner() const; - void set_ignore_mouse(bool p_ignore); - bool is_ignoring_mouse() const; - - void set_stop_mouse(bool p_stop); - bool is_stopping_mouse() const; + void set_mouse_filter(MouseFilter p_filter); + MouseFilter get_mouse_filter() const; /* SKINNING */ @@ -417,5 +419,6 @@ VARIANT_ENUM_CAST(Control::AnchorType); VARIANT_ENUM_CAST(Control::FocusMode); VARIANT_ENUM_CAST(Control::SizeFlags); VARIANT_ENUM_CAST(Control::CursorShape); +VARIANT_ENUM_CAST(Control::MouseFilter); #endif |