maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Corrects wrong scrolling for short popups broken in 15405

Browse source
This commit is contained in:
Bernhard Liebl 2018-01-07 02:19:11 +01:00
parent 29e68aa40e
commit 249521670d
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: {
_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());
}
}
}