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

Fixed issue #11893 (SpinBox Capturing mouse)

Browse source 
To prevent the SpinBox from capturing mouse, added a "drag.allowed"
variable that is set to true only when clicking inside the control.
Entering the control with the left mouse button pressed will not
trigger drag anymore.

Also modified the value update code when dragging so it does not
modify the base_val.
This commit is contained in:
Rodolphe Suescun 2018-08-27 07:57:30 +02:00 committed by RodZill4
parent fa024537a3
commit 0838eca063
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scene/gui/spin_box.cpp
View file

@ -110,6 +110,9 @@ void SpinBox::_gui_input(const Ref<InputEvent> &p_event) {
range_click_timer->start();
line_edit->grab_focus();
drag.allowed = true;
drag.capture_pos = mb->get_position();
} break;
case BUTTON_RIGHT: {
@ -133,14 +136,7 @@ void SpinBox::_gui_input(const Ref<InputEvent> &p_event) {
}
}
if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == 1) {
//set_default_cursor_shape(CURSOR_VSIZE);
Vector2 cpos = Vector2(mb->get_position().x, mb->get_position().y);
drag.mouse_pos = cpos;
}
if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == 1) {
if (mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
//set_default_cursor_shape(CURSOR_ARROW);
range_click_timer->stop();
@ -150,32 +146,24 @@ void SpinBox::_gui_input(const Ref<InputEvent> &p_event) {
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
warp_mouse(drag.capture_pos);
}
drag.allowed = false;
}
Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid() && mm->get_button_mask() & 1) {
Vector2 cpos = mm->get_position();
if (mm.is_valid() && mm->get_button_mask() & BUTTON_MASK_LEFT) {
if (drag.enabled) {
float diff_y = drag.mouse_pos.y - cpos.y;
diff_y = Math::pow(ABS(diff_y), 1.8f) * SGN(diff_y);
diff_y *= 0.1;
drag.mouse_pos = cpos;
drag.base_val = CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max());
set_value(drag.base_val);
} else if (drag.mouse_pos.distance_to(cpos) > 2) {
drag.diff_y += mm->get_relative().y;
float diff_y = -0.01 * Math::pow(ABS(drag.diff_y), 1.8f) * SGN(drag.diff_y);
set_value(CLAMP(drag.base_val + get_step() * diff_y, get_min(), get_max()));
} else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) {
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
drag.enabled = true;
drag.base_val = get_value();
drag.mouse_pos = cpos;
drag.capture_pos = cpos;
drag.diff_y = 0;
}
}
}

4
scene/gui/spin_box.h
View file

@ -54,10 +54,10 @@ class SpinBox : public Range {
struct Drag {
float base_val;
bool allowed;
bool enabled;
Vector2 from;
Vector2 mouse_pos;
Vector2 capture_pos;
float diff_y;
} drag;
void _line_edit_focus_exit();