asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Release mouse when SpinBox leaves scene tree

Browse source 
(cherry picked from commit 83f6c6b360)
This commit is contained in:
kobewi 2021-03-06 22:22:24 +01:00 committed by Rémi Verschelde
parent 81fd486c92
commit 749892c9fc
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scene/gui/spin_box.cpp
View file

@ -92,6 +92,14 @@ void SpinBox::_range_click_timeout() {
} }
} }
void SpinBox::_release_mouse() {
if (drag.enabled) {
drag.enabled = false;
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
warp_mouse(drag.capture_pos);
}
}
void SpinBox::_gui_input(const Ref<InputEvent> &p_event) { void SpinBox::_gui_input(const Ref<InputEvent> &p_event) {
if (!is_editable()) { if (!is_editable()) {
@ -145,12 +153,7 @@ void SpinBox::_gui_input(const Ref<InputEvent> &p_event) {
//set_default_cursor_shape(CURSOR_ARROW); //set_default_cursor_shape(CURSOR_ARROW);
range_click_timer->stop(); range_click_timer->stop();
_release_mouse();
if (drag.enabled) {
drag.enabled = false;
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
warp_mouse(drag.capture_pos);
}
drag.allowed = false; drag.allowed = false;
} }
@ -211,6 +214,8 @@ void SpinBox::_notification(int p_what) {
_adjust_width_for_icon(get_icon("updown")); _adjust_width_for_icon(get_icon("updown"));
_value_changed(0); _value_changed(0);
} else if (p_what == NOTIFICATION_EXIT_TREE) {
_release_mouse();
} else if (p_what == NOTIFICATION_THEME_CHANGED) { } else if (p_what == NOTIFICATION_THEME_CHANGED) {
call_deferred("minimum_size_changed"); call_deferred("minimum_size_changed");

1
scene/gui/spin_box.h
View file

@ -44,6 +44,7 @@ class SpinBox : public Range {
Timer *range_click_timer; Timer *range_click_timer;
void _range_click_timeout(); void _range_click_timeout();
void _release_mouse();
void _text_entered(const String &p_string); void _text_entered(const String &p_string);
virtual void _value_changed(double); virtual void _value_changed(double);