diff options
| author | Bernhard Liebl <Bernhard.Liebl@gmx.org> | 2018-01-07 02:19:11 +0100 |
|---|---|---|
| committer | Bernhard Liebl <Bernhard.Liebl@gmx.org> | 2018-01-07 02:19:11 +0100 |
| commit | 249521670de023030e41b1ee4edfc10ec0b5f1e5 (patch) | |
| tree | f991417f2cd651681685e685a189264d6e38fba2 /scene/gui | |
| parent | 29e68aa40e3effa1946b3889021b8c61a933c05c (diff) | |
Corrects wrong scrolling for short popups broken in 15405
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index d7987d4a19..cf01ce8643 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -305,11 +305,15 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { case BUTTON_WHEEL_DOWN: { - _scroll(-b->get_factor(), b->get_position()); + if (get_global_position().y + get_size().y > get_viewport_rect().size.y) { + _scroll(-b->get_factor(), b->get_position()); + } } break; case BUTTON_WHEEL_UP: { - _scroll(b->get_factor(), b->get_position()); + if (get_global_position().y < 0) { + _scroll(b->get_factor(), b->get_position()); + } } break; case BUTTON_LEFT: { @@ -380,7 +384,9 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventPanGesture> pan_gesture = p_event; if (pan_gesture.is_valid()) { - _scroll(-pan_gesture->get_delta().y, pan_gesture->get_position()); + if (get_global_position().y + get_size().y > get_viewport_rect().size.y || get_global_position().y < 0) { + _scroll(-pan_gesture->get_delta().y, pan_gesture->get_position()); + } } } |