diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-07 12:46:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 12:46:50 +0100 |
| commit | da913f2675479078b6fea6d749c95aaf48643e1e (patch) | |
| tree | d557af19d947571f8ed3aaff6b8aca2c057271da | |
| parent | 58d3756ec0692c63a4fbb4d16d188598a58530ee (diff) | |
| parent | 249521670de023030e41b1ee4edfc10ec0b5f1e5 (diff) | |
Merge pull request #15429 from poke1024/fix-popup-scroll-correction
Corrects wrong scrolling for short popups broken in 15405
| -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()); + } } } |