add session-scope selection ops for Stripables

[ardour.git] / gtk2_ardour / panner_ui.cc

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index f35c79d4fe7cc2ba77184048cb1032e987480835..2df7a819ada7f3fc9bc5a04e2727ade68436d02d 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -27,12 +27,14 @@
 #include "ardour/panner_shell.h"
 #include "ardour/session.h"
 
-#include "ardour_ui.h"
 #include "panner_ui.h"
 #include "panner2d.h"
 #include "gui_thread.h"
 #include "stereo_panner.h"
+#include "timers.h"
+#include "tooltips.h"
 #include "mono_panner.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -41,8 +43,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-
-const int PannerUI::pan_bar_height = 35;
+using namespace ARDOUR_UI_UTILS;
 
 PannerUI::PannerUI (Session* s)
        : _current_nouts (-1)
@@ -68,8 +69,8 @@ PannerUI::PannerUI (Session* s)
        pan_automation_style_button.set_name ("MixerAutomationModeButton");
        pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
 
-       ARDOUR_UI::instance()->set_tip (pan_automation_state_button, _("Pan automation mode"));
-       ARDOUR_UI::instance()->set_tip (pan_automation_style_button, _("Pan automation type"));
+       set_tooltip (pan_automation_state_button, _("Pan automation mode"));
+       set_tooltip (pan_automation_style_button, _("Pan automation type"));
 
        //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
        //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2);
@@ -241,6 +242,8 @@ PannerUI::setup_pan ()
                return;
        }
 
+       const float scale = std::max (1.f, UIConfiguration::instance().get_ui_scale());
+
        if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui")
        {
                delete big_window;
@@ -249,7 +252,7 @@ PannerUI::setup_pan ()
                boost::shared_ptr<Pannable> pannable = _panner->pannable();
 
                _stereo_panner = new StereoPanner (_panshell);
-               _stereo_panner->set_size_request (-1, pan_bar_height);
+               _stereo_panner->set_size_request (-1, 5 * ceilf(7.f * scale));
                _stereo_panner->set_send_drawing_mode (_send_mode);
                pan_vbox.pack_start (*_stereo_panner, false, false);
 
@@ -285,7 +288,7 @@ PannerUI::setup_pan ()
 
                _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
-               _mono_panner->set_size_request (-1, pan_bar_height);
+               _mono_panner->set_size_request (-1, 5 * ceilf(7.f * scale));
                _mono_panner->set_send_drawing_mode (_send_mode);
 
                update_pan_sensitive ();
@@ -294,7 +297,7 @@ PannerUI::setup_pan ()
        else if (_current_uri == "http://ardour.org/plugin/panner_vbap#ui")
        {
                if (!twod_panner) {
-                       twod_panner = new Panner2d (_panshell, 61);
+                       twod_panner = new Panner2d (_panshell, rintf(61.f * scale));
                        twod_panner->set_name ("MixerPanZone");
                        twod_panner->show ();
                        twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false);
@@ -305,7 +308,7 @@ PannerUI::setup_pan ()
                if (big_window) {
                        big_window->reset (nins);
                }
-               twod_panner->set_size_request (-1, 61);
+               twod_panner->set_size_request (-1, rintf(61.f * scale));
                twod_panner->set_send_drawing_mode (_send_mode);
 
                /* and finally, add it to the panner frame */
@@ -576,7 +579,7 @@ PannerUI::pan_automation_state_changed ()
        pan_watching.disconnect();
 
        if (x) {
-               pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
+               pan_watching = Timers::rapid_connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
        }
 }
 
@@ -599,16 +602,16 @@ PannerUI::_astate_string (AutoState state, bool shrt)
 
        switch (state) {
        case ARDOUR::Off:
-               sstr = (shrt ? "M" : _("M"));
+               sstr = (shrt ? "M" : S_("Manual|M"));
                break;
        case Play:
-               sstr = (shrt ? "P" : _("P"));
+               sstr = (shrt ? "P" : S_("Play|P"));
                break;
        case Touch:
-               sstr = (shrt ? "T" : _("T"));
+               sstr = (shrt ? "T" : S_("Touch|T"));
                break;
        case Write:
-               sstr = (shrt ? "W" : _("W"));
+               sstr = (shrt ? "W" : S_("Write|W"));
                break;
        }