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

Fix scrollwheel triggering focus change 

Clicking or using the scrollwheel outside of the focused control triggers a focus change. This makes sense for mouse clicks, but scrollwheeling outside the focuses control does not. This PR ignores scrollwheeling outside of the focused control.
This commit is contained in:
Emmanuel Barroga 2019-09-08 18:13:15 -07:00
parent 24e1039eb6
commit b8007b3947
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/main/viewport.cpp
View File

@ -1742,6 +1742,12 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
return; // no one gets the event if exclusive NO ONE return; // no one gets the event if exclusive NO ONE
} }
if (mb->get_button_index() == BUTTON_WHEEL_UP || mb->get_button_index() == BUTTON_WHEEL_DOWN || mb->get_button_index() == BUTTON_WHEEL_LEFT || mb->get_button_index() == BUTTON_WHEEL_RIGHT) {
//cancel scroll wheel events, only clicks should trigger focus changes.
set_input_as_handled();
return;
}
top->notification(Control::NOTIFICATION_MODAL_CLOSE); top->notification(Control::NOTIFICATION_MODAL_CLOSE);
top->_modal_stack_remove(); top->_modal_stack_remove();
top->hide(); top->hide();