X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fardour_button.h;h=65ea10b201427cf18e46791d6ccedf5059538be4;hb=7e3282486d9638b6cfa1cd727a793df949270091;hp=c09a05fc8c5c0daffcb82b9af98068726a631d41;hpb=b08d13706f9e98fc75a727822209942c00d8f1b3;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index c09a05fc8c..65ea10b201 100644
--- 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,19 +37,24 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 		Body = 0x2,
 		Text = 0x4,
 		Indicator = 0x8,
+		FlatFace = 0x10,
 	};
 
 	static Element default_elements;
 	static Element led_default_elements;
 	static Element just_led_default_elements;
 
+	static void set_flat_buttons (bool yn);
+	static bool flat_buttons() { return _flat_buttons; }
+
 	ArdourButton (Element e = default_elements);
 	ArdourButton (const std::string&, Element e = default_elements);
 	virtual ~ArdourButton ();
 
 	enum Tweaks {
 		ShowClick = 0x1,
-		NoModel = 0x4,
+		NoModel = 0x2,
+		ImplicitUsesSolidColor = 0x4,
 	};
 
 	Tweaks tweaks() const { return _tweaks; }
@@ -61,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);
@@ -68,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);
@@ -113,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;
 
@@ -141,6 +156,8 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	bool _fixed_diameter;
 	bool _distinct_led_click;
 	bool _hovering;
+    
+	static bool _flat_buttons;
 
 	void setup_led_rect ();
 	void set_colors ();
@@ -151,9 +168,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	void action_sensitivity_changed ();
 	void action_visibility_changed ();
 	void action_tooltip_changed ();
-
-	static cairo_pattern_t* mid_mask;
-	static void create_mid_mask ();
 };
 
 #endif /* __gtk2_ardour_ardour_button_h__ */