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

Fix wrong local mouse pos when holding spinbox and improve behaviour

Browse source
This commit is contained in:
Ignacio Etcheverry 2016-01-21 14:08:40 +01:00
parent d1bb868a19
commit bd6f7a411c
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/spin_box.cpp
View file

@ -72,8 +72,7 @@ void SpinBox::_range_click_timeout() {
if (!drag.enabled && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) { if (!drag.enabled && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) {
int pos_y = Input::get_singleton()->get_mouse_pos().y-get_global_pos().y; bool up = get_local_mouse_pos().y < (get_size().height/2);
bool up = pos_y < (get_size().height/2);
set_val( get_val() + (up?get_step():-get_step())); set_val( get_val() + (up?get_step():-get_step()));
if (range_click_timer->is_one_shot()) { if (range_click_timer->is_one_shot()) {

12
scene/gui/tree.cpp
View file

@ -1373,7 +1373,7 @@ void Tree::_range_click_timeout() {
if (range_item_last && !range_drag_enabled && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) { if (range_item_last && !range_drag_enabled && Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) {
Point2 pos = (Input::get_singleton()->get_mouse_pos()-get_global_pos())-cache.bg->get_offset(); Point2 pos = get_local_mouse_pos()-cache.bg->get_offset();
if (show_column_titles) { if (show_column_titles) {
pos.y-=_get_title_button_height(); pos.y-=_get_title_button_height();
@ -1384,7 +1384,7 @@ void Tree::_range_click_timeout() {
} }
click_handled=false; click_handled=false;
InputModifierState mod = {}; // should be irrelevant.. InputModifierState mod = InputModifierState(); // should be irrelevant..
blocked++; blocked++;
propagate_mouse_event(pos+cache.offset, 0, 0, false, root, BUTTON_LEFT, mod); propagate_mouse_event(pos+cache.offset, 0, 0, false, root, BUTTON_LEFT, mod);
@ -1414,6 +1414,10 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
if (!skip && p_pos.y<item_h) { if (!skip && p_pos.y<item_h) {
// check event! // check event!
if (range_click_timer->get_time_left() > 0 && p_item != range_item_last) {
return -1;
}
if (!hide_folding && (p_pos.x >=x_ofs && p_pos.x < (x_ofs+cache.item_margin) )) { if (!hide_folding && (p_pos.x >=x_ofs && p_pos.x < (x_ofs+cache.item_margin) )) {
@ -2074,8 +2078,6 @@ void Tree::_input_event(InputEvent p_event) {
update_cache(); update_cache();
const InputEventMouseMotion& b=p_event.mouse_motion; const InputEventMouseMotion& b=p_event.mouse_motion;
range_click_timer->stop();
Ref<StyleBox> bg = cache.bg; Ref<StyleBox> bg = cache.bg;
Point2 pos = Point2(b.x,b.y) - bg->get_offset(); Point2 pos = Point2(b.x,b.y) - bg->get_offset();
@ -2272,12 +2274,10 @@ void Tree::_input_event(InputEvent p_event) {
} break; } break;
case BUTTON_WHEEL_UP: { case BUTTON_WHEEL_UP: {
range_click_timer->stop();
v_scroll->set_val( v_scroll->get_val()-v_scroll->get_page()/8 ); v_scroll->set_val( v_scroll->get_val()-v_scroll->get_page()/8 );
} break; } break;
case BUTTON_WHEEL_DOWN: { case BUTTON_WHEEL_DOWN: {
range_click_timer->stop();
v_scroll->set_val( v_scroll->get_val()+v_scroll->get_page()/8 ); v_scroll->set_val( v_scroll->get_val()+v_scroll->get_page()/8 );
} break; } break;
} }