part two of allow markup to be used in BoolOption items in an option editor

[ardour.git] / gtk2_ardour / mono_panner.cc

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 43afcd5c840c3cb639f559f40935317dd40cc41b..7dd16d4853db726c4c325471fc874275c75b126c 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -31,13 +31,15 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/persistent_tooltip.h"
 
-#include "ardour/panner.h"
+#include "ardour/pannable.h"
 #include "ardour/panner.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
 #include "mono_panner.h"
+#include "mono_panner_editor.h"
 #include "rgb_macros.h"
 #include "utils.h"
 
@@ -55,16 +57,15 @@ static const int top_step = 2;
 MonoPanner::ColorScheme MonoPanner::colors;
 bool MonoPanner::have_colors = false;
 
-MonoPanner::MonoPanner (boost::shared_ptr<PBD::Controllable> position)
-        : position_control (position)
-        , dragging (false)
+MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::Panner> panner)
+       : PannerInterface (panner)
+       , position_control (_panner->pannable()->pan_azimuth_control)
         , drag_start_x (0)
         , last_drag_x (0)
         , accumulated_delta (0)
         , detented (false)
-        , drag_data_window (0)
-        , drag_data_label (0)
-        , position_binder (position)
+        , position_binder (position_control)
+       , _dragging (false)
 {
         if (!have_colors) {
                 set_colors ();
@@ -73,29 +74,19 @@ MonoPanner::MonoPanner (boost::shared_ptr<PBD::Controllable> position)
 
         position_control->Changed.connect (connections, invalidator(*this), boost::bind (&MonoPanner::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, &MonoPanner::color_handler));
 
-        ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler));
+       set_tooltip ();
 }
 
 MonoPanner::~MonoPanner ()
 {
-        delete drag_data_window;
+       
 }
 
 void
-MonoPanner::set_drag_data ()
+MonoPanner::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.
@@ -110,14 +101,7 @@ MonoPanner::set_drag_data ()
         snprintf (buf, sizeof (buf), "L:%3d R:%3d",
                   (int) rint (100.0 * (1.0 - pos)),
                   (int) rint (100.0 * pos));
-        drag_data_label->set_markup (buf);
-}
-
-void
-MonoPanner::value_change ()
-{
-        set_drag_data ();
-        queue_draw ();
+        _tooltip.set_tip (buf);
 }
 
 bool
@@ -263,10 +247,15 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 bool
 MonoPanner::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 = false;
+        _dragging = false;
+       _tooltip.target_stop_drag ();
         accumulated_delta = 0;
         detented = false;
 
@@ -301,7 +290,8 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
                         position_control->set_value (0.5);
                 }
 
-                dragging = false;
+                _dragging = false;
+               _tooltip.target_stop_drag ();
 
         } else if (ev->type == GDK_BUTTON_PRESS) {
 
@@ -310,7 +300,8 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
                         return true;
                 }
 
-                dragging = true;
+                _dragging = true;
+               _tooltip.target_start_drag ();
                 StartGesture ();
         }
 
@@ -320,21 +311,21 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
 bool
 MonoPanner::on_button_release_event (GdkEventButton* ev)
 {
+       if (PannerInterface::on_button_release_event (ev)) {
+               return true;
+       }
+
         if (ev->button != 1) {
                 return false;
         }
 
-        dragging = false;
+        _dragging = false;
+       _tooltip.target_stop_drag ();
         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);
+               _panner->reset ();
         } else {
                 StopGesture ();
         }
@@ -374,37 +365,10 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev)
 bool
 MonoPanner::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<Window*> (get_toplevel());
-                if (toplevel) {
-                        drag_data_window->set_transient_for (*toplevel);
-                }
-        }
-
-        if (!drag_data_window->is_visible ()) {
-                /* move the window a little away from the mouse */
-                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;
 
@@ -468,27 +432,6 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
         return true;
 }
 
-bool
-MonoPanner::on_key_release_event (GdkEventKey*)
-{
-        return false;
-}
-
-bool
-MonoPanner::on_enter_notify_event (GdkEventCrossing*)
-{
-       grab_focus ();
-       Keyboard::magic_widget_grab_focus ();
-       return false;
-}
-
-bool
-MonoPanner::on_leave_notify_event (GdkEventCrossing*)
-{
-       Keyboard::magic_widget_drop_focus ();
-       return false;
-}
-
 void
 MonoPanner::set_colors ()
 {
@@ -503,6 +446,12 @@ MonoPanner::set_colors ()
 void
 MonoPanner::color_handler ()
 {
-        set_colors ();
-        queue_draw ();
+       set_colors ();
+       queue_draw ();
+}
+
+PannerEditor*
+MonoPanner::editor ()
+{
+       return new MonoPannerEditor (this);
 }