diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-24 14:21:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 14:21:06 +0200 |
| commit | 96d7bc62af25b85b8b9cc091eeea1e7a784ba624 (patch) | |
| tree | 83d8a70c911fe7f8d20080a1395d195eb8370d05 /scene/gui/popup_menu.cpp | |
| parent | 9ac27b58c53b50b5c7085a8fdee653e9eff159d1 (diff) | |
| parent | 4e6efd1b07f1c6d53d226977ddc729333b74306a (diff) | |
Merge pull request #50511 from aaronfranke/iterators
Use C++ range iterators for Lists in many situations
Diffstat (limited to 'scene/gui/popup_menu.cpp')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 14c86c0d27..ae3db4a983 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -397,8 +397,8 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseMotion> m = p_event; if (m.is_valid()) { - for (List<Rect2>::Element *E = autohide_areas.front(); E; E = E->next()) { - if (!Rect2(Point2(), get_size()).has_point(m->get_position()) && E->get().has_point(m->get_position())) { + for (Rect2 &E : autohide_areas) { + if (!Rect2(Point2(), get_size()).has_point(m->get_position()) && E.has_point(m->get_position())) { _close_pressed(); return; } @@ -751,8 +751,8 @@ void PopupMenu::_notification(int p_what) { Point2 mouse_pos = DisplayServer::get_singleton()->mouse_get_position(); mouse_pos -= get_position(); - for (List<Rect2>::Element *E = autohide_areas.front(); E; E = E->next()) { - if (!Rect2(Point2(), get_size()).has_point(mouse_pos) && E->get().has_point(mouse_pos)) { + for (Rect2 &E : autohide_areas) { + if (!Rect2(Point2(), get_size()).has_point(mouse_pos) && E.has_point(mouse_pos)) { _close_pressed(); return; } |