left/bottom align of labels in meterbridge

[ardour.git] / gtk2_ardour / ardour_button.h

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 94b3c6d399a14b9400b438ae18c33f3160d76040..efa956162a772c7e8f3f4016ee61f99308f8c07f 100644 (file)
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #ifndef __gtk2_ardour_ardour_button_h__
@@ -38,6 +37,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
                Body = 0x2,
                Text = 0x4,
                Indicator = 0x8,
+               FlatFace = 0x10,
        };
 
        static Element default_elements;
@@ -53,7 +53,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        enum Tweaks {
                ShowClick = 0x1,
-               NoModel = 0x4,
+               NoModel = 0x2,
+               ImplicitUsesSolidColor = 0x4,
        };
 
        Tweaks tweaks() const { return _tweaks; }
@@ -64,6 +65,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        Element elements() const { return _elements; }
        void set_elements (Element);
+       void add_elements (Element);
        
        void set_corner_radius (float);
        void set_rounded_corner_mask (int);
@@ -71,6 +73,9 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 
        void set_text (const std::string&);
        void set_markup (const std::string&);
+       void set_angle (const double);
+       void set_alignment (const float, const float);
+       void get_alignment (float& xa, float& ya) {xa = _xalign; ya = _yalign;};
 
        void set_led_left (bool yn);
        void set_distinct_led_click (bool yn);
@@ -116,9 +121,16 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
        float _corner_radius;
        int   _corner_mask;
 
-       cairo_pattern_t* edge_pattern;
-       cairo_pattern_t* active_pattern;
-       cairo_pattern_t* inactive_pattern;
+       double _angle;
+       float _xalign, _yalign;
+
+       uint32_t bg_color;
+       uint32_t border_color;
+       uint32_t fill_color_active;
+       uint32_t fill_color_inactive;
+       cairo_pattern_t* fill_pattern;
+       cairo_pattern_t* fill_pattern_active;
+       cairo_pattern_t* shine_pattern;
        cairo_pattern_t* led_inset_pattern;
        cairo_pattern_t* reflection_pattern;