X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_button.h;h=65ea10b201427cf18e46791d6ccedf5059538be4;hb=fdbb9d240d870dd7ddf9c04dcfe5b1d5c7211639;hp=8da31a106624ab3804f37f3bc2cd621afc0f57fa;hpb=702cca1c93fe3a8c142380cba724823ff7a1f26b;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 8da31a1066..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__
@@ -27,10 +26,10 @@
 
 #include "pbd/signals.h"
 #include "gtkmm2ext/binding_proxy.h"
+#include "gtkmm2ext/activatable.h"
+#include "gtkmm2ext/cairo_widget.h"
 
-#include "cairo_widget.h"
-
-class ArdourButton : public CairoWidget
+class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 {
   public:
 	enum Element {
@@ -38,19 +37,24 @@ class ArdourButton : public CairoWidget
 		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; }
@@ -59,30 +63,31 @@ class ArdourButton : public CairoWidget
 	void set_active_state (Gtkmm2ext::ActiveState);
 	void set_visual_state (Gtkmm2ext::VisualState);
 
-	/* this is an API simplification for buttons
-	   that only use the Active and Normal active states.
-	*/
-	void set_active (bool);
-	bool get_active () { return active_state() != Gtkmm2ext::ActiveState (0); }
-
-	void set_elements (Element);
 	Element elements() const { return _elements; }
-
+	void set_elements (Element);
+	void add_elements (Element);
+	
 	void set_corner_radius (float);
+	void set_rounded_corner_mask (int);
 	void set_diameter (float);
 
 	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);
 
+	Glib::RefPtr<Pango::Layout> layout() const { return _layout; }
+
 	sigc::signal<void> signal_led_clicked;
 	sigc::signal<void> signal_clicked;
 
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
  	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
-        void watch ();
+	void watch ();
 
 	void set_related_action (Glib::RefPtr<Gtk::Action>);
 
@@ -99,8 +104,8 @@ class ArdourButton : public CairoWidget
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
 
-        void controllable_changed ();
-        PBD::ScopedConnection watch_connection;
+	void controllable_changed ();
+	PBD::ScopedConnection watch_connection;
 
   private:
 	Glib::RefPtr<Pango::Layout> _layout;
@@ -108,19 +113,29 @@ class ArdourButton : public CairoWidget
 	std::string                 _text;
 	Element                     _elements;
 	Tweaks                      _tweaks;
-	BindingProxy binding_proxy;
-	bool    _act_on_release;
+	BindingProxy                binding_proxy;
 
 	int   _text_width;
 	int   _text_height;
 	float _diameter;
 	float _corner_radius;
+	int   _corner_mask;
+
+	double _angle;
+	float _xalign, _yalign;
 
-	cairo_pattern_t* edge_pattern;
+	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;
 
+	cairo_rectangle_t* _led_rect;
+
 	double text_r;
 	double text_g;
 	double text_b;
@@ -131,18 +146,23 @@ class ArdourButton : public CairoWidget
 	double led_b;
 	double led_a;
 
+	double active_r;
+	double active_g;
+	double active_b;
+	double active_a;
+
+	bool _act_on_release;
 	bool _led_left;
 	bool _fixed_diameter;
 	bool _distinct_led_click;
-	cairo_rectangle_t* _led_rect;
 	bool _hovering;
+    
+	static bool _flat_buttons;
 
 	void setup_led_rect ();
 	void set_colors ();
 	void color_handler ();
 
-	Glib::RefPtr<Gtk::Action> _action;
-	void action_activated ();
 	void action_toggled ();
 
 	void action_sensitivity_changed ();