clean up a-pong

[ardour.git] / gtk2_ardour / ardour_button.h

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 25986ccc0c8bb4ea7afcfb970d0dc6c4367a2fe2..c20a62535971e604e9aa32440993c14e6bb66faf 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; }
@@ -90,6 +91,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;
 
@@ -104,7 +111,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        void set_image (const Glib::RefPtr<Gdk::Pixbuf>&);
 
-       void set_fixed_colors (const uint32_t active_color, const uint32_t inactive_color);
+       void set_fixed_colors   (const uint32_t active_color, const uint32_t inactive_color);
+       void set_active_color   (const uint32_t active_color);
+       void set_inactive_color (const uint32_t inactive_color);
 
        void set_fallthrough_to_parent(bool fall) { _fallthrough_to_parent = fall; }
 
@@ -121,6 +130,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 *);
@@ -132,6 +142,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        Glib::RefPtr<Pango::Layout> _layout;
        Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
        std::string                 _text;
+       std::string                 _sizing_text;
        Element                     _elements;
        Gtkmm2ext::ArdourIcon::Icon _icon;
        Tweaks                      _tweaks;
@@ -172,7 +183,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        bool _distinct_led_click;
        bool _hovering;
        bool _focused;
-       bool _fixed_colors_set;
+       int  _fixed_colors_set;
        bool _fallthrough_to_parent;
        int _layout_ellipsize_width;
        Pango::EllipsizeMode _ellipsis;