X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.cc;h=721567bf10de0a8c4c074d7d5ce530a4d533fd74;hb=cd0d68a591ee64bb0e85d9a364af9fe6abdeecbe;hp=690acbfddaf626b632a0e57a5c213b3aee8b408d;hpb=0938a42440cc82ce8d0cb064840c258c863714ab;p=ardour.git diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 690acbfdda..721567bf10 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -30,6 +30,7 @@ #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" +#include "gtkmm2ext/persistent_tooltip.h" #include "ardour/pannable.h" #include "ardour/panner.h" @@ -37,6 +38,7 @@ #include "ardour_ui.h" #include "global_signals.h" #include "stereo_panner.h" +#include "stereo_panner_editor.h" #include "rgb_macros.h" #include "utils.h" @@ -57,10 +59,9 @@ bool StereoPanner::have_colors = false; using namespace ARDOUR; StereoPanner::StereoPanner (boost::shared_ptr panner) - : _panner (panner) + : PannerInterface (panner) , position_control (_panner->pannable()->pan_azimuth_control) , width_control (_panner->pannable()->pan_width_control) - , dragging (false) , dragging_position (false) , dragging_left (false) , dragging_right (false) @@ -68,10 +69,9 @@ StereoPanner::StereoPanner (boost::shared_ptr panner) , last_drag_x (0) , accumulated_delta (0) , detented (false) - , drag_data_window (0) - , drag_data_label (0) , position_binder (position_control) , width_binder (width_control) + , _dragging (false) { if (!have_colors) { set_colors (); @@ -81,29 +81,19 @@ StereoPanner::StereoPanner (boost::shared_ptr panner) position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); - set_flags (Gtk::CAN_FOCUS); - - add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK| - Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK| - Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK| - Gdk::SCROLL_MASK| - Gdk::POINTER_MOTION_MASK); - ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); + + set_tooltip (); } StereoPanner::~StereoPanner () { - delete drag_data_window; + } void -StereoPanner::set_drag_data () +StereoPanner::set_tooltip () { - if (!drag_data_label) { - return; - } - double pos = position_control->get_value(); // 0..1 /* We show the position of the center of the image relative to the left & right. @@ -115,21 +105,14 @@ StereoPanner::set_drag_data () */ char buf[64]; - snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)), + snprintf (buf, sizeof (buf), _("L:%3d R:%3d Width:%d%%"), (int) rint (100.0 * (1.0 - pos)), (int) rint (100.0 * pos), (int) floor (100.0 * width_control->get_value())); - drag_data_label->set_markup (buf); -} - -void -StereoPanner::value_change () -{ - set_drag_data (); - queue_draw (); + _tooltip.set_tip (buf); } bool -StereoPanner::on_expose_event (GdkEventExpose* ev) +StereoPanner::on_expose_event (GdkEventExpose*) { Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); @@ -163,7 +146,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) /* background */ context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); - rounded_rectangle (context, 0, 0, width, height, corner_radius); + cairo_rectangle (context->cobj(), 0, 0, width, height); context->fill (); /* the usable width is reduced from the real width, because we need space for @@ -281,13 +264,18 @@ StereoPanner::on_expose_event (GdkEventExpose* ev) bool StereoPanner::on_button_press_event (GdkEventButton* ev) { + if (PannerInterface::on_button_press_event (ev)) { + return true; + } + drag_start_x = ev->x; last_drag_x = ev->x; dragging_position = false; dragging_left = false; dragging_right = false; - dragging = false; + _dragging = false; + _tooltip.target_stop_drag (); accumulated_delta = 0; detented = false; @@ -364,7 +352,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) } } - dragging = false; + _dragging = false; + _tooltip.target_stop_drag (); } else if (ev->type == GDK_BUTTON_PRESS) { @@ -405,7 +394,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) StartWidthGesture (); } - dragging = true; + _dragging = true; + _tooltip.target_start_drag (); } return true; @@ -414,27 +404,26 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) bool StereoPanner::on_button_release_event (GdkEventButton* ev) { + if (PannerInterface::on_button_release_event (ev)) { + return true; + } + if (ev->button != 1) { return false; } - bool dp = dragging_position; + bool const dp = dragging_position; - dragging = false; + _dragging = false; + _tooltip.target_stop_drag (); dragging_position = false; dragging_left = false; dragging_right = false; accumulated_delta = 0; detented = false; - if (drag_data_window) { - 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); + _panner->reset (); } else { if (dp) { StopPositionGesture (); @@ -485,72 +474,78 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev) bool StereoPanner::on_motion_notify_event (GdkEventMotion* ev) { - if (!dragging) { + if (!_dragging) { return false; } - if (!drag_data_window) { - drag_data_window = new Window (WINDOW_POPUP); - drag_data_window->set_name (X_("ContrastingPopup")); - drag_data_window->set_position (WIN_POS_MOUSE); - drag_data_window->set_decorated (false); - - drag_data_label = manage (new Label); - drag_data_label->set_use_markup (true); - - drag_data_window->set_border_width (6); - drag_data_window->add (*drag_data_label); - drag_data_label->show (); - - Window* toplevel = dynamic_cast (get_toplevel()); - if (toplevel) { - drag_data_window->set_transient_for (*toplevel); - } - } - - if (!drag_data_window->is_visible ()) { - /* move the popup window vertically down from the panner display */ - int rx, ry; - get_window()->get_origin (rx, ry); - drag_data_window->move (rx, ry+get_height()); - drag_data_window->present (); - } - - int w = get_width(); - double delta = (ev->x - last_drag_x) / (double) w; + int usable_width = get_width() - lr_box_size; + double delta = (ev->x - last_drag_x) / (double) usable_width; double current_width = width_control->get_value (); if (dragging_left) { delta = -delta; } - + if (dragging_left || dragging_right) { - /* maintain position as invariant as we change the width */ + if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { + /* change width and position in a way that keeps the + * other side in the same place + */ - /* create a detent close to the center */ + _panner->freeze (); + + double pv = position_control->get_value(); - if (!detented && fabs (current_width) < 0.02) { - detented = true; - /* snap to zero */ - width_control->set_value (0); - } + if (dragging_left) { + position_control->set_value (pv - delta); + } else { + position_control->set_value (pv + delta); + } - if (detented) { + if (delta > 0.0) { + /* delta is positive, so we're about to + increase the width. But we need to increase it + by twice the required value so that the + other side remains in place when we set + the position as well. + */ + width_control->set_value (current_width + (delta * 2.0)); + } else { + width_control->set_value (current_width + delta); + } - accumulated_delta += delta; + _panner->thaw (); - /* have we pulled far enough to escape ? */ + } else { - if (fabs (accumulated_delta) >= 0.025) { - width_control->set_value (current_width + accumulated_delta); - detented = false; - accumulated_delta = false; + /* maintain position as invariant as we change the width */ + + /* create a detent close to the center */ + + if (!detented && fabs (current_width) < 0.02) { + detented = true; + /* snap to zero */ + width_control->set_value (0); + } + + if (detented) { + + accumulated_delta += delta; + + /* have we pulled far enough to escape ? */ + + if (fabs (accumulated_delta) >= 0.025) { + width_control->set_value (current_width + accumulated_delta); + detented = false; + accumulated_delta = false; + } + + } else { + /* width needs to change by 2 * delta because both L & R move */ + width_control->set_value (current_width + (delta * 2.0)); } - - } else { - width_control->set_value (current_width + delta); } } else if (dragging_position) { @@ -595,6 +590,7 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) } else { width_control->set_value (wv - step); } + break; case GDK_Left: pv -= step; @@ -604,8 +600,6 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) pv += step; position_control->set_value (pv); break; - - break; case GDK_0: case GDK_KP_0: width_control->set_value (0.0); @@ -618,27 +612,6 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) return true; } -bool -StereoPanner::on_key_release_event (GdkEventKey*) -{ - return false; -} - -bool -StereoPanner::on_enter_notify_event (GdkEventCrossing*) -{ - grab_focus (); - Keyboard::magic_widget_grab_focus (); - return false; -} - -bool -StereoPanner::on_leave_notify_event (GdkEventCrossing*) -{ - Keyboard::magic_widget_drop_focus (); - return false; -} - void StereoPanner::set_colors () { @@ -667,3 +640,9 @@ StereoPanner::color_handler () set_colors (); queue_draw (); } + +PannerEditor* +StereoPanner::editor () +{ + return new StereoPannerEditor (this); +}