Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / stereo_panner.cc

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 5ee75ecc195ca2ca2e79917bd60610e971f33df4..4e5c6de95945ab135929d56cd80d95c9222754f6 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"
@@ -70,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 ();
@@ -80,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 ()
@@ -88,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.
@@ -105,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
@@ -146,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
@@ -275,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;
 
@@ -352,6 +353,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                }
 
                _dragging = false;
+               _tooltip.target_stop_drag ();
 
        } else if (ev->type == GDK_BUTTON_PRESS) {
 
@@ -360,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;
@@ -395,6 +395,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                }
 
                _dragging = true;
+               _tooltip.target_start_drag ();
        }
 
        return true;
@@ -414,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 {
@@ -615,23 +615,23 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-       colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get();
-       colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
-       colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
-       colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
-       colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-       colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
-       colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
-       colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
-       colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
-       colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-       colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
-       colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
-       colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
-       colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
-       colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+       colors[Normal].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerFill();
+       colors[Normal].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerOutline();
+       colors[Normal].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerText();
+       colors[Normal].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerBackground();
+       colors[Normal].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+       colors[Mono].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoFill();
+       colors[Mono].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoOutline();
+       colors[Mono].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoText();
+       colors[Mono].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoBackground();
+       colors[Mono].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+       colors[Inverted].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedFill();
+       colors[Inverted].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedOutline();
+       colors[Inverted].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedText();
+       colors[Inverted].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedBackground();
+       colors[Inverted].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
 }
 
 void