浏览代码

Merge pull request #85652 from rsubtil/bugfix-can_grab_focus

Ensure slider grabs focus only when it can
Yuri Sizov 1 年之前
父节点
当前提交
26834d298d
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      scene/gui/slider.cpp

+ 6 - 2
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());
 			}
 		}