From b8007b39474ff3f5beca80123009d57a83b236c3 Mon Sep 17 00:00:00 2001 From: Emmanuel Barroga Date: Sun, 8 Sep 2019 18:13:15 -0700 Subject: [PATCH] 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. --- scene/main/viewport.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index b5c82ce4e3f..2d23ca8c73f 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1742,6 +1742,12 @@ void Viewport::_gui_input_event(Ref p_event) { 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->_modal_stack_remove(); top->hide();