minor logic changes to editor selection

[ardour.git] / gtk2_ardour / ardour_button.h

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 928f4a8355e581e14e59d43f7a35cfc9db48a200..a659c1ec85d6cf248e2d519532048ef12776dbee 100644 (file)
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -55,7 +55,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        enum Tweaks {
                Square = 0x1,
                TrackHeader = 0x2,
-               unused3 = 0x4,
+               OccasionalText = 0x4,
+               unused4 = 0x8,
        };
 
        Tweaks tweaks() const { return _tweaks; }
@@ -77,8 +78,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        void set_corner_radius (float);
 
-       void set_text (const std::string&);
-       const std::string& get_text () {return _text;}
+       void set_text (const std::string&, bool markup = false);
+       const std::string& get_text () { return _text; }
+       bool get_markup () const { return _markup; }
        void set_angle (const double);
        void set_alignment (const float, const float);
        void get_alignment (float& xa, float& ya) {xa = _xalign; ya = _yalign;};
@@ -90,6 +92,12 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void set_layout_font (const Pango::FontDescription&);
        void set_text_ellipsize (Pango::EllipsizeMode);
 
+    /* Sets the text used for size request computation. Pass an
+     * empty string to return to the default behavior which uses
+     * the currently displayed text for measurement. */
+       void set_sizing_text (const std::string&);
+       const std::string& get_sizing_text () {return _sizing_text;}
+
        sigc::signal<void, GdkEventButton*> signal_led_clicked;
        sigc::signal<void> signal_clicked;
 
@@ -123,6 +131,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void on_realize ();
        bool on_enter_notify_event (GdkEventCrossing*);
        bool on_leave_notify_event (GdkEventCrossing*);
+       bool on_grab_broken_event(GdkEventGrabBroken*);
        bool on_focus_in_event (GdkEventFocus*);
        bool on_focus_out_event (GdkEventFocus*);
        bool on_key_release_event (GdkEventKey *);
@@ -134,11 +143,14 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        Glib::RefPtr<Pango::Layout> _layout;
        Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
        std::string                 _text;
+       std::string                 _sizing_text;
+       bool                        _markup;
        Element                     _elements;
        Gtkmm2ext::ArdourIcon::Icon _icon;
        Tweaks                      _tweaks;
        BindingProxy                binding_proxy;
 
+       void set_text_internal ();
        void recalc_char_pixel_geometry ();
        unsigned int _char_pixel_width;
        unsigned int _char_pixel_height;