godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15429 from poke1024/fix-popup-scroll-correction

Browse Source 
Corrects wrong scrolling for short popups broken in 15405
This commit is contained in:
Rémi Verschelde 2018-01-07 12:46:50 +01:00 committed by GitHub
commit da913f2675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/popup_menu.cpp
View File

@ -305,11 +305,15 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
case BUTTON_WHEEL_DOWN: { 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; } break;
case BUTTON_WHEEL_UP: { 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; } break;
case BUTTON_LEFT: { case BUTTON_LEFT: {
@ -380,7 +384,9 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventPanGesture> pan_gesture = p_event; Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) { 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());
}
} }
} }