diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-26 14:30:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-26 14:30:35 +0000 |
| commit | 2adb3fb579068b5a278df2ac96d131fe5f40f169 (patch) | |
| tree | 8e5f59b70813fb506a9935f08b8851e7380cc3b9 /gtk2_ardour/mono_panner.cc | |
| parent | 6e79521e8b7709458b8ee093e2d0dc6440ffea2c (diff) | |
Show panner drag information tool-tip style, and also show
it when the button is pressed to start a drag (#4584 and
#4585).
git-svn-id: svn://localhost/ardour2/branches/3.0@11072 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mono_panner.cc')
| -rw-r--r-- | gtk2_ardour/mono_panner.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 5764c4c137..e93dc83894 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -59,7 +59,6 @@ bool MonoPanner::have_colors = false; MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::Panner> panner) : PannerInterface (panner) , position_control (_panner->pannable()->pan_azimuth_control) - , dragging (false) , drag_start_x (0) , last_drag_x (0) , accumulated_delta (0) @@ -251,7 +250,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) drag_start_x = ev->x; last_drag_x = ev->x; - dragging = false; + _dragging = false; accumulated_delta = 0; detented = false; @@ -286,7 +285,7 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) position_control->set_value (0.5); } - dragging = false; + _dragging = false; } else if (ev->type == GDK_BUTTON_PRESS) { @@ -295,8 +294,9 @@ MonoPanner::on_button_press_event (GdkEventButton* ev) return true; } - dragging = true; + _dragging = true; StartGesture (); + show_drag_data_window (); } return true; @@ -309,13 +309,11 @@ MonoPanner::on_button_release_event (GdkEventButton* ev) return false; } - dragging = false; + _dragging = false; accumulated_delta = 0; detented = false; - if (_drag_data_window) { - _drag_data_window->hide (); - } + hide_drag_data_window (); if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) { _panner->reset (); @@ -358,12 +356,10 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev) bool MonoPanner::on_motion_notify_event (GdkEventMotion* ev) { - if (!dragging) { + if (!_dragging) { return false; } - show_drag_data_window (); - int w = get_width(); double delta = (ev->x - last_drag_x) / (double) w; |