allow sending OSC from inline display UIs

[ardour.git] / gtk2_ardour / ardour_button.cc

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index aa283828234e3b36081b3a67f8b3793ecb722b02..922ba84d2c08ae82739395e7af749440c9bcc899 100644 (file)
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -39,7 +39,7 @@
 #include "tooltips.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #define BASELINESTRETCH (1.25)
 #define TRACKHEADERBTNW (3.10)
@@ -58,7 +58,8 @@ ArdourButton::Element ArdourButton::led_default_elements = ArdourButton::Element
 ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Indicator);
 
 ArdourButton::ArdourButton (Element e)
-       : _elements (e)
+       : _sizing_text("")
+       , _elements (e)
        , _icon (Gtkmm2ext::ArdourIcon::NoIcon)
        , _tweaks (Tweaks (0))
        , _char_pixel_width (0)
@@ -97,10 +98,13 @@ ArdourButton::ArdourButton (Element e)
        , _pattern_height (0)
 {
        UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
+       /* This is not provided by gtkmm */
+       signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
 }
 
 ArdourButton::ArdourButton (const std::string& str, Element e)
-       : _elements (e)
+       : _sizing_text("")
+       , _elements (e)
        , _tweaks (Tweaks (0))
        , _char_pixel_width (0)
        , _char_pixel_height (0)
@@ -140,6 +144,8 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
        set_text (str);
        UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
        UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
+       /* This is not provided by gtkmm */
+       signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
 }
 
 ArdourButton::~ArdourButton()
@@ -182,6 +188,24 @@ ArdourButton::set_text (const std::string& str)
        ensure_layout ();
        if (_layout && _layout->get_text() != _text) {
                _layout->set_text (_text);
+               /* on_size_request() will fill in _text_width/height
+                * so queue it even if _sizing_text != "" */
+               queue_resize ();
+       }
+}
+
+void
+ArdourButton::set_sizing_text (const std::string& str)
+{
+       if (_sizing_text == str) {
+               return;
+       }
+       _sizing_text = str;
+       if (!is_realized()) {
+               return;
+       }
+       ensure_layout ();
+       if (_layout) {
                queue_resize ();
        }
 }
@@ -290,7 +314,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
        }
 
        //show the "convex" or "concave" gradient
-       if (!_flat_buttons) {
+       if (!_flat_buttons && (_elements & Body)==Body) {
                if ( active_state() == Gtkmm2ext::ExplicitActive && ( !((_elements & Indicator)==Indicator) || use_custom_led_color) ) {
                        //concave
                        cairo_set_source (cr, concave_pattern);
@@ -521,8 +545,10 @@ ArdourButton::on_realize()
 {
        CairoWidget::on_realize ();
        ensure_layout ();
-       if (_layout && _layout->get_text() != _text) {
-               _layout->set_text (_text);
+       if (_layout) {
+               if (_layout->get_text() != _text) {
+                       _layout->set_text (_text);
+               }
                queue_resize ();
        }
 }
@@ -543,27 +569,34 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
 
        if (_elements & Text) {
 
+               ensure_layout();
+               _layout->set_text (_text);
+               /* render() needs the size of the displayed text */
+               _layout->get_pixel_size (_text_width, _text_height);
+
                if (_tweaks & OccasionalText) {
 
                        /* size should not change based on presence or absence
                         * of text.
                         */
 
-                       if (!_text.empty()) {
-                               ensure_layout ();
-                               _layout->set_text (_text);
-                               _layout->get_pixel_size (_text_width, _text_height);
+               } else { //if (!_text.empty() || !_sizing_text.empty()) {
+
+                       req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
+                       req->width += rint(1.75 * char_pixel_width()); // padding
+
+                       if (!_sizing_text.empty()) {
+                               _layout->set_text (_sizing_text); /* use sizing text */
                        }
 
-               } else if (!_text.empty()) {
+                       int sizing_text_width = 0, sizing_text_height = 0;
+                       _layout->get_pixel_size (sizing_text_width, sizing_text_height);
 
-                       //if _layout does not exist, char_pixel_height() creates it,
+                       req->width += sizing_text_width;
 
-                       req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
-                       assert (_layout);
-                       _layout->get_pixel_size (_text_width, _text_height);
-                       req->width += rint(1.75 * char_pixel_width()); // padding
-                       req->width += _text_width;
+                       if (!_sizing_text.empty()) {
+                               _layout->set_text (_text); /* restore display text */
+                       }
                }
 
                /* XXX hack (surprise). Deal with two common rotation angles */
@@ -616,7 +649,7 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
                        req->width = req->height;
                if (req->height < req->width)
                        req->height = req->width;
-       } else if (_text_width > 0 && !(_elements & (Menu | Indicator))) {
+       } else if (_sizing_text.empty() && _text_width > 0 && !(_elements & (Menu | Indicator))) {
                // properly centered text for those elements that are centered
                // (no sub-pixel offset)
                if ((req->width - _text_width) & 1) { ++req->width; }
@@ -932,6 +965,11 @@ ArdourButton::on_style_changed (const RefPtr<Gtk::Style>&)
 {
        _update_colors = true;
        CairoWidget::set_dirty ();
+       _char_pixel_width = 0;
+       _char_pixel_height = 0;
+       if (is_realized()) {
+               queue_resize ();
+       }
 }
 
 void
@@ -1060,6 +1098,16 @@ ArdourButton::on_leave_notify_event (GdkEventCrossing* ev)
        return CairoWidget::on_leave_notify_event (ev);
 }
 
+bool
+ArdourButton::on_grab_broken_event(GdkEventGrabBroken* grab_broken_event) {
+       /* Our implicit grab due to a button_press was broken by another grab:
+        * the button will not get any button_release event if the mouse leaves
+        * while the grab is taken, so unpress ourselves */
+       _grabbed = false;
+       CairoWidget::set_dirty ();
+       return true;
+}
+
 void
 ArdourButton::set_tweaks (Tweaks t)
 {