ardour/livetrax
13
0
Fork 0
Code

better detent handling, and dbl-click behaviour for lower half improvements

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8391 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-30 18:59:09 +00:00
parent f669a4b581
commit 55ec9b3a18
1 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
gtk2_ardour/stereo_panner.cc
View File

@ -64,6 +64,7 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost
, drag_start_x (0) , drag_start_x (0)
, last_drag_x (0) , last_drag_x (0)
, accumulated_delta (0) , accumulated_delta (0)
, detented (false)
, drag_data_window (0) , drag_data_window (0)
, drag_data_label (0) , drag_data_label (0)
{ {
@ -289,34 +290,21 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
dragging_position = false; dragging_position = false;
dragging_left = false; dragging_left = false;
dragging_right = false; dragging_right = false;
dragging = false;
accumulated_delta = 0; accumulated_delta = 0;
detented = false;
if (ev->y < 20) {
/* top section of widget is for position drags */
dragging_position = true;
} else {
/* lower section is for dragging width */
double pos = position_control->get_value (); /* 0..1 */
double swidth = width_control->get_value (); /* -1..+1 */
double fswidth = fabs (swidth);
int usable_width = get_width() - lr_box_size;
double center = (lr_box_size/2.0) + (usable_width * pos);
int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
int right = lrint (center + (fswidth * usable_width / 2.0)); // center of rightmost box
const int half_box = lr_box_size/2;
if (ev->x >= (left - half_box) && ev->x < (left + half_box)) {
dragging_left = true;
} else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) {
dragging_right = true;
}
}
if (ev->type == GDK_2BUTTON_PRESS) { if (ev->type == GDK_2BUTTON_PRESS) {
if (dragging_position) { int width = get_width();
int width = get_width();
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* handled by button release */
return true;
}
if (ev->y < 20) {
/* lower section: adjusts position, constrained by width */
if (ev->x >= width/2 - 10 && ev->x <= width/2 + 10) { if (ev->x >= width/2 - 10 && ev->x <= width/2 + 10) {
/* double click near center, reset position to center */ /* double click near center, reset position to center */
position_control->set_value (0.5); position_control->set_value (0.5);
@ -331,20 +319,54 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
position_control->set_value (1.0); position_control->set_value (1.0);
} }
} }
} else { } else {
if (dragging_left) { /* lower section: adjusts width, constrained by position */
if (ev->x <= width/3) {
/* left side dbl click */
width_control->set_value (1.0); // reset width to 100% width_control->set_value (1.0); // reset width to 100%
} else if (dragging_right) { } else if (ev->x > 2*width/3) {
/* right side dbl click */
width_control->set_value (-1.0); // reset width to inverted 100% width_control->set_value (-1.0); // reset width to inverted 100%
} else { } else {
/* center dbl click */
width_control->set_value (0); // collapse width to 0% width_control->set_value (0); // collapse width to 0%
} }
} }
dragging = false; dragging = false;
} else { } else if (ev->type == GDK_BUTTON_PRESS) {
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* handled by button release */
return true;
}
if (ev->y < 20) {
/* top section of widget is for position drags */
dragging_position = true;
} else {
/* lower section is for dragging width */
double pos = position_control->get_value (); /* 0..1 */
double swidth = width_control->get_value (); /* -1..+1 */
double fswidth = fabs (swidth);
int usable_width = get_width() - lr_box_size;
double center = (lr_box_size/2.0) + (usable_width * pos);
int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
int right = lrint (center + (fswidth * usable_width / 2.0)); // center of rightmost box
const int half_box = lr_box_size/2;
if (ev->x >= (left - half_box) && ev->x < (left + half_box)) {
dragging_left = true;
} else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) {
dragging_right = true;
}
}
dragging = true; dragging = true;
} }
@ -359,10 +381,17 @@ StereoPanner::on_button_release_event (GdkEventButton* ev)
dragging_left = false; dragging_left = false;
dragging_right = false; dragging_right = false;
accumulated_delta = 0; accumulated_delta = 0;
detented = false;
if (drag_data_window) { if (drag_data_window) {
drag_data_window->hide (); drag_data_window->hide ();
} }
if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* reset to default */
position_control->set_value (0.5);
width_control->set_value (1.0);
}
set_tooltip (); set_tooltip ();
@ -452,16 +481,24 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
/* create a detent close to the center */ /* create a detent close to the center */
if (fabs (current_width) < 0.1) { if (!detented && fabs (current_width) < 0.02) {
detented = true;
/* snap to zero */
width_control->set_value (0);
}
if (detented) {
accumulated_delta += delta; accumulated_delta += delta;
/* in the detent - have we pulled far enough to escape ? */
/* have we pulled far enough to escape ? */
if (fabs (accumulated_delta) >= 0.1) { if (fabs (accumulated_delta) >= 0.1) {
width_control->set_value (current_width + accumulated_delta); width_control->set_value (current_width + accumulated_delta);
accumulated_delta = 0; detented = false;
} else { accumulated_delta = false;
/* snap to zero */
width_control->set_value (0);
} }
} else { } else {
width_control->set_value (current_width + delta); width_control->set_value (current_width + delta);
} }