diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-21 14:18:58 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-21 14:18:58 +0100 |
| commit | 432e7bf839c58c54d9191e22e93d5ae97e778ed9 (patch) | |
| tree | 59f08f6441b21f8d95132d31cf4144e7606e5411 | |
| parent | 5f2f6ace27d0a3bfd64d9fc50dc004445a8c564f (diff) | |
| parent | bd6f7a411c8b2a9e163e01d52a303333eac4fe78 (diff) | |
Merge pull request #3403 from neikeq/spinbox_hold_imp
Fix and improved Spinbox behaviour
| -rw-r--r-- | scene/gui/spin_box.cpp | 3 | ||||
| -rw-r--r-- | scene/gui/tree.cpp | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 38c61ded2c..2b64d36a81 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -72,8 +72,7 @@ void SpinBox::_range_click_timeout() { 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 = pos_y < (get_size().height/2); + bool up = get_local_mouse_pos().y < (get_size().height/2); set_val( get_val() + (up?get_step():-get_step())); if (range_click_timer->is_one_shot()) { diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 8d28180490..e6f09ece94 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -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)) { - 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) { pos.y-=_get_title_button_height(); @@ -1384,7 +1384,7 @@ void Tree::_range_click_timeout() { } click_handled=false; - InputModifierState mod = {}; // should be irrelevant.. + InputModifierState mod = InputModifierState(); // should be irrelevant.. blocked++; 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) { // 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) )) { @@ -2074,8 +2078,6 @@ void Tree::_input_event(InputEvent p_event) { update_cache(); const InputEventMouseMotion& b=p_event.mouse_motion; - range_click_timer->stop(); - Ref<StyleBox> bg = cache.bg; Point2 pos = Point2(b.x,b.y) - bg->get_offset(); @@ -2272,12 +2274,10 @@ void Tree::_input_event(InputEvent p_event) { } break; case BUTTON_WHEEL_UP: { - range_click_timer->stop(); v_scroll->set_val( v_scroll->get_val()-v_scroll->get_page()/8 ); } break; case BUTTON_WHEEL_DOWN: { - range_click_timer->stop(); v_scroll->set_val( v_scroll->get_val()+v_scroll->get_page()/8 ); } break; } |