mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 06:44:57 +01:00
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
This commit is contained in:
parent
6e79521e8b
commit
2adb3fb579
5 changed files with 50 additions and 23 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue