Small cleanup

[ardour.git] / gtk2_ardour / ardour_button.h

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 3e257c0dbd5f06843dcce59909e51b826ecbe628..8f24d439278c55b34e14b3882898cf44468b8a97 100644 (file)
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -40,9 +40,24 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
                unused = 0x10,
                Menu = 0x20,
                Inactive = 0x40, // no _action is defined AND state is not used
-               RecButton = 0x80, // tentative, see commit message
-               RecTapeMode = 0x100, // tentative
-               CloseCross = 0x200, // tentative
+               VectorIcon = 0x80, // tentative, see commit message
+       };
+
+       enum Icon {
+               NoIcon,
+               RecButton,
+               RecTapeMode,
+               CloseCross,
+               StripWidth,
+               DinMidi,
+               TransportStop,
+               TransportPlay,
+               TransportLoop,
+               TransportRange,
+               TransportStart,
+               TransportEnd,
+               TransportPanic,
+               TransportMetronom,
        };
 
        static Element default_elements;
@@ -55,7 +70,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        enum Tweaks {
                Square = 0x1,
-               unused2 = 0x2,
+               TrackHeader = 0x2,
                unused3 = 0x4,
        };
 
@@ -65,14 +80,18 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void set_active_state (Gtkmm2ext::ActiveState);
        void set_visual_state (Gtkmm2ext::VisualState);
 
+       void set_custom_led_color (const uint32_t c, const bool useit = true);
+
        void set_act_on_release (bool onRelease) { _act_on_release = onRelease; }
 
        Element elements() const { return _elements; }
        void set_elements (Element);
        void add_elements (Element);
 
+       Icon icon() const { return _icon; }
+       void set_icon (Icon);
+
        void set_corner_radius (float);
-       void set_diameter (float);
 
        void set_text (const std::string&);
        const std::string& get_text () {return _text;}
@@ -83,9 +102,10 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        void set_led_left (bool yn);
        void set_distinct_led_click (bool yn);
 
-       void set_layout_ellisize_width (int w);
+       void set_layout_ellipsize_width (int w);
+       void set_layout_font (const Pango::FontDescription&);
        void set_text_ellipsize (Pango::EllipsizeMode);
-
+       
        sigc::signal<void> signal_led_clicked;
        sigc::signal<void> signal_clicked;
 
@@ -106,6 +126,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        unsigned int char_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_pixel_width; }
        unsigned int char_pixel_height() { if (_char_pixel_height < 1) recalc_char_pixel_geometry() ; return _char_pixel_height; }
+       float char_avg_pixel_width() { if (_char_pixel_width < 1) recalc_char_pixel_geometry() ; return _char_avg_pixel_width; }
 
        protected:
        void render (cairo_t *, cairo_rectangle_t *);
@@ -128,12 +149,14 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        Glib::RefPtr<Gdk::Pixbuf>   _pixbuf;
        std::string                 _text;
        Element                     _elements;
+       Icon                        _icon;
        Tweaks                      _tweaks;
        BindingProxy                binding_proxy;
 
        void recalc_char_pixel_geometry ();
        unsigned int _char_pixel_width;
        unsigned int _char_pixel_height;
+       float _char_avg_pixel_width;
 
        int   _text_width;
        int   _text_height;
@@ -152,6 +175,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        uint32_t led_active_color;
        uint32_t led_inactive_color;
+       uint32_t led_custom_color;
+       bool     use_custom_led_color;
 
        cairo_pattern_t* convex_pattern;
        cairo_pattern_t* concave_pattern;
@@ -167,7 +192,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        bool _fallthrough_to_parent;
        int _layout_ellipsize_width;
        Pango::EllipsizeMode _ellipsis;
-       bool _update_colors_and_patterns;
+       bool _update_colors;
+       int _pattern_height;
 
        void setup_led_rect ();
        void set_colors ();