diff options
Diffstat (limited to 'scene/gui/popup_menu.h')
| -rw-r--r-- | scene/gui/popup_menu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h index 9f4d28e95d..492084b43f 100644 --- a/scene/gui/popup_menu.h +++ b/scene/gui/popup_menu.h @@ -32,7 +32,6 @@ #define POPUP_MENU_H #include "core/input/shortcut.h" -#include "scene/gui/margin_container.h" #include "scene/gui/popup.h" #include "scene/gui/scroll_container.h" #include "scene/property_list_helper.h" @@ -110,10 +109,12 @@ class PopupMenu : public Popup { Vector<Item> items; BitField<MouseButtonMask> initial_button_mask; bool during_grabbed_click = false; + bool is_scrolling = false; int mouse_over = -1; int submenu_over = -1; String _get_accel_text(const Item &p_item) const; int _get_mouse_over(const Point2 &p_over) const; + void _mouse_over_update(const Point2 &p_over); virtual Size2 _get_contents_minimum_size() const override; int _get_item_height(int p_idx) const; @@ -142,7 +143,6 @@ class PopupMenu : public Popup { uint64_t search_time_msec = 0; String search_string = ""; - MarginContainer *margin_container = nullptr; ScrollContainer *scroll_container = nullptr; Control *control = nullptr; @@ -195,7 +195,6 @@ class PopupMenu : public Popup { } theme_cache; void _draw_items(); - void _draw_background(); void _minimum_lifetime_timeout(); void _close_pressed(); |