mark the step entry dialog as a dialog even though it is an ArdourWindow, to help...

[ardour.git] / gtk2_ardour / stereo_panner.cc

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 96e1821ee6434cced8f7cef8408296775198718c..721567bf10de0a8c4c074d7d5ce530a4d533fd74 100644 (file)
--- 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"
 
@@ -69,6 +71,7 @@ StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner)
        , detented (false)
        , position_binder (position_control)
        , width_binder (width_control)
+       , _dragging (false)
 {
        if (!have_colors) {
                set_colors ();
@@ -79,6 +82,8 @@ StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner)
        width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
 
        ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler));
+
+       set_tooltip ();
 }
 
 StereoPanner::~StereoPanner ()
@@ -87,12 +92,8 @@ StereoPanner::~StereoPanner ()
 }
 
 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.
@@ -104,10 +105,10 @@ 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);
+       _tooltip.set_tip (buf);
 }
 
 bool
@@ -145,7 +146,7 @@ StereoPanner::on_expose_event (GdkEventExpose*)
        /* 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
@@ -263,6 +264,10 @@ StereoPanner::on_expose_event (GdkEventExpose*)
 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;
 
@@ -270,6 +275,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
        dragging_left = false;
        dragging_right = false;
        _dragging = false;
+       _tooltip.target_stop_drag ();
        accumulated_delta = 0;
        detented = false;
 
@@ -347,6 +353,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                }
 
                _dragging = false;
+               _tooltip.target_stop_drag ();
 
        } else if (ev->type == GDK_BUTTON_PRESS) {
 
@@ -355,8 +362,6 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                        return true;
                }
 
-               show_drag_data_window ();
-
                if (ev->y < 20) {
                        /* top section of widget is for position drags */
                        dragging_position = true;
@@ -390,6 +395,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                }
 
                _dragging = true;
+               _tooltip.target_start_drag ();
        }
 
        return true;
@@ -398,6 +404,10 @@ 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;
        }
@@ -405,14 +415,13 @@ StereoPanner::on_button_release_event (GdkEventButton* ev)
        bool const dp = dragging_position;
 
        _dragging = false;
+       _tooltip.target_stop_drag ();
        dragging_position = false;
        dragging_left = false;
        dragging_right = false;
        accumulated_delta = 0;
        detented = false;
 
-       hide_drag_data_window ();
-
        if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
                _panner->reset ();
        } else {
@@ -631,3 +640,9 @@ StereoPanner::color_handler ()
        set_colors ();
        queue_draw ();
 }
+
+PannerEditor*
+StereoPanner::editor ()
+{
+       return new StereoPannerEditor (this);
+}