Merge pull request godotengine#85652 from rsubtil/bugfix-can_grab_focus

Ensure slider grabs focus only when it can
TheSofox · Dec 19, 2023 · 26834d2 · 26834d2
2 parents 252c462 + fde51ae
commit 26834d2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp
@@ -88,10 +88,14 @@ void Slider::gui_input(const Ref<InputEvent> &p_event) {
 			}
 		} else if (scrollable) {
 			if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_UP) {
-				grab_focus();
+				if (get_focus_mode() != FOCUS_NONE) {
+					grab_focus();
+				}
 				set_value(get_value() + get_step());
 			} else if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_DOWN) {
-				grab_focus();
+				if (get_focus_mode() != FOCUS_NONE) {
+					grab_focus();
+				}
 				set_value(get_value() - get_step());
 			}
 		}