X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_button.cc;h=a9eabd33d933abe0fe1dc45b65abf86fbf8fcf21;hb=b604dd24139b4c84f20521af91ec4c0cd721bd13;hp=2bc73398aee9b9b9b82e8c84c47bb549c773999d;hpb=cc4f13193caac6108f19953dde658204dfaccbbd;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 2bc73398ae..a9eabd33d9 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -30,12 +30,16 @@
 #include "gtkmm2ext/rgb_macros.h"
 #include "gtkmm2ext/gui_thread.h"
 
+#include "ardour/rc_configuration.h" // for widget prelight preference
+
 #include "ardour_button.h"
 #include "ardour_ui.h"
 #include "global_signals.h"
 
 #include "i18n.h"
 
+#define REFLECTION_HEIGHT 2
+
 using namespace Gdk;
 using namespace Gtk;
 using namespace Glib;
@@ -47,30 +51,84 @@ using namespace std;
 ArdourButton::Element ArdourButton::default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text);
 ArdourButton::Element ArdourButton::led_default_elements = ArdourButton::Element (ArdourButton::default_elements|ArdourButton::Indicator);
 ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::Element (ArdourButton::Edge|ArdourButton::Body|ArdourButton::Indicator);
+bool ArdourButton::_flat_buttons = false;
 
 ArdourButton::ArdourButton (Element e)
 	: _elements (e)
-	, _act_on_release (true)
+	, _tweaks (Tweaks (0))
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (11.0)
-	, _corner_radius (9.0)
-	, edge_pattern (0)
+	, _corner_radius (4.0)
+	, _corner_mask (0xf)
+	, border_color (0)
+	, fill_color_active (0)
+	, fill_color_inactive (0)
 	, fill_pattern (0)
+	, fill_pattern_active (0)
+	, shine_pattern (0)
 	, led_inset_pattern (0)
 	, reflection_pattern (0)
+	, _led_rect (0)
+	, _act_on_release (true)
 	, _led_left (false)
 	, _fixed_diameter (true)
 	, _distinct_led_click (false)
-	, _led_rect (0)
+	, _hovering (false)
 {
 	ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
-	StateChanged.connect (sigc::mem_fun (*this, &ArdourButton::state_handler));
+}
+
+ArdourButton::ArdourButton (const std::string& str, Element e)
+	: _elements (e)
+	, _tweaks (Tweaks (0))
+	, _text_width (0)
+	, _text_height (0)
+	, _diameter (11.0)
+	, _corner_radius (4.0)
+	, _corner_mask (0xf)
+	, border_color (0)
+	, fill_color_active (0)
+	, fill_color_inactive (0)
+	, fill_pattern (0)
+	, fill_pattern_active (0)
+	, shine_pattern (0)
+	, led_inset_pattern (0)
+	, reflection_pattern (0)
+	, _led_rect (0)
+	, _act_on_release (true)
+	, _led_left (false)
+	, _fixed_diameter (true)
+	, _distinct_led_click (false)
+	, _hovering (false)
+{
+	set_text (str);
 }
 
 ArdourButton::~ArdourButton()
 {
 	delete _led_rect;
+
+	if (shine_pattern) {
+		cairo_pattern_destroy (shine_pattern);
+	}
+
+	if (fill_pattern) {
+		cairo_pattern_destroy (fill_pattern);
+	}
+	
+	if (fill_pattern_active) {
+		cairo_pattern_destroy (fill_pattern_active);
+	}
+	
+	if (led_inset_pattern) {
+		cairo_pattern_destroy (led_inset_pattern);
+	}
+	
+	if (reflection_pattern) {
+		cairo_pattern_destroy (reflection_pattern);
+	}
+
 }
 
 void
@@ -81,8 +139,10 @@ ArdourButton::set_text (const std::string& str)
 	if (!_layout && !_text.empty()) {
 		_layout = Pango::Layout::create (get_pango_context());
 	} 
-	
-	_layout->set_text (str);
+
+	if (_layout) {
+		_layout->set_text (str);
+	}
 
 	queue_resize ();
 }
@@ -103,33 +163,112 @@ ArdourButton::set_markup (const std::string& str)
 void
 ArdourButton::render (cairo_t* cr)
 {
+	void (*rounded_function)(cairo_t*, double, double, double, double, double);
+
+	switch (_corner_mask) {
+	case 0x1: /* upper left only */
+		rounded_function = Gtkmm2ext::rounded_top_left_rectangle;
+		break;
+	case 0x2: /* upper right only */
+		rounded_function = Gtkmm2ext::rounded_top_right_rectangle;
+		break;
+	case 0x3: /* upper only */
+		rounded_function = Gtkmm2ext::rounded_top_rectangle;
+		break;
+		/* should really have functions for lower right, lower left,
+		   lower only, but for now, we don't
+		*/
+	default:
+		rounded_function = Gtkmm2ext::rounded_rectangle;
+	}
+
 	if (!_fixed_diameter) {
-		_diameter = std::min (_width, _height);
+		_diameter = std::min (get_width(), get_height());
 	}
 
-	/* background fill. use parent window style, so that we fit in nicely.
-	 */
-	
-	Color c = get_parent_bg ();
+	float r,g,b,a;
 
-	cairo_rectangle (cr, 0, 0, _width, _height);
-	cairo_stroke_preserve (cr);
-	cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
-	cairo_fill (cr);
+	if ((_elements & Body)==Body) {
+		if (_elements & Edge) {
 
-	if (_elements & Edge) {
-		Gtkmm2ext::rounded_rectangle (cr, 0, 0, _width, _height, _corner_radius);
-		cairo_set_source (cr, edge_pattern);
-		cairo_fill (cr);
+			cairo_set_source_rgba (cr, 0, 0, 0, 1);
+			rounded_function(cr, 0, 0, get_width(), get_height(), _corner_radius);
+			cairo_fill (cr);
+
+			rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1.5);
+		} else {
+			rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
+		}
+
+		if (active_state() == Gtkmm2ext::ImplicitActive) {
+			
+			if (!(_tweaks & ImplicitUsesSolidColor)) {
+				cairo_set_source (cr, fill_pattern);
+			} else {
+				cairo_set_source (cr, fill_pattern_active);
+			}
+			cairo_fill (cr);
+			
+			if (!(_tweaks & ImplicitUsesSolidColor)) {
+				//border
+				UINT_TO_RGBA (fill_color_active, &r, &g, &b, &a);
+				cairo_set_line_width (cr, 1.0);
+				rounded_function (cr, 2, 2, get_width()-4, get_height()-4, _corner_radius - 1.5);
+				cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
+				cairo_stroke (cr);
+			}
+				
+		} else if (active_state() == Gtkmm2ext::ExplicitActive || ((_elements & Indicator)==Indicator) ) {
+
+			//background color
+			cairo_set_source (cr, fill_pattern_active);
+			cairo_fill (cr);
+
+		} else {
+
+			//background color
+			cairo_set_source (cr, fill_pattern);
+			cairo_fill (cr);
+
+		}
 	}
 
-	if (_elements & Body) {
-		if (_elements & Edge) {
-			Gtkmm2ext::rounded_rectangle (cr, 1, 1, _width-2, _height-2, _corner_radius - 1.0);
+	if ( ((_elements & FlatFace)==FlatFace) && (active_state() != Gtkmm2ext::ExplicitActive) ) {
+
+		if ( !_flat_buttons ) {
+			float rheight = get_height()*0.5-REFLECTION_HEIGHT;
+			Gtkmm2ext::rounded_rectangle (cr, 2, 3, get_width()-4, rheight, _corner_radius-1);
+			cairo_set_source (cr, shine_pattern);
+			cairo_fill (cr);
+		}
+
+		if (active_state() == Gtkmm2ext::ExplicitActive) {
+
+			UINT_TO_RGBA (fill_color_active, &r, &g, &b, &a);
+			cairo_set_line_width (cr, 2.0);
+			rounded_function (cr, 2, 2, get_width()-4, get_height()-4, _corner_radius - 2.0);
+			cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
+			cairo_fill (cr);
+
 		} else {
-			Gtkmm2ext::rounded_rectangle (cr, 0, 0, _width, _height, _corner_radius - 1.0);
+
+			UINT_TO_RGBA (fill_color_inactive, &r, &g, &b, &a);
+			cairo_set_line_width (cr, 2.0);
+			rounded_function (cr, 2, 2, get_width()-4, get_height()-4, _corner_radius - 2.0);
+			cairo_set_source_rgba (cr, r/255.0, g/255.0, b/255.0, a/255.0);
+			cairo_fill (cr);
+
 		}
-		cairo_set_source (cr, fill_pattern);
+	}
+
+	if (_pixbuf) {
+
+		double x,y;
+		x = (get_width() - _pixbuf->get_width())/2.0;
+		y = (get_height() - _pixbuf->get_height())/2.0;
+
+		cairo_rectangle (cr, x, y, _pixbuf->get_width(), _pixbuf->get_height());
+		gdk_cairo_set_source_pixbuf (cr, _pixbuf->gobj(), x, y);
 		cairo_fill (cr);
 	}
 
@@ -137,31 +276,32 @@ ArdourButton::render (cairo_t* cr)
 
 	int text_margin;
 
-	if (_width < 75) {
-		text_margin = 3;
+	if (get_width() < 75) {
+		text_margin = 5;
 	} else {
 		text_margin = 10;
 	}
 
-	if ((_elements & Text) && !_text.empty()) {
+	if ( ((_elements & Text)==Text) && !_text.empty()) {
 
-		cairo_set_source_rgba (cr, text_r, text_g, text_b, text_a);
+		cairo_new_path (cr);	
 
 		if (_elements & Indicator) {
 			if (_led_left) {
-				cairo_move_to (cr, text_margin + _diameter + 4, _height/2.0 - _text_height/2.0);
+				cairo_move_to (cr, text_margin + _diameter + 4, get_height()/2.0 - _text_height/2.0);
 			} else {
-				cairo_move_to (cr, text_margin, _height/2.0 - _text_height/2.0);
+				cairo_move_to (cr, text_margin, get_height()/2.0 - _text_height/2.0);
 			}
 		} else {
 			/* center text */
-			cairo_move_to (cr, (_width - _text_width)/2.0, _height/2.0 - _text_height/2.0);
+			cairo_move_to (cr, (get_width() - _text_width)/2.0, get_height()/2.0 - _text_height/2.0);
 		}
 
+		cairo_set_source_rgba (cr, text_r, text_g, text_b, text_a);
 		pango_cairo_show_layout (cr, _layout->gobj());
 	} 
 
-	if (_elements & Indicator) {
+	if (((_elements & Indicator)==Indicator)) {
 
 		/* move to the center of the indicator/led */
 
@@ -169,12 +309,12 @@ ArdourButton::render (cairo_t* cr)
 
 		if (_elements & Text) {
 			if (_led_left) {
-				cairo_translate (cr, text_margin + (_diameter/2.0), _height/2.0);
+				cairo_translate (cr, text_margin + (_diameter/2.0), get_height()/2.0);
 			} else {
-				cairo_translate (cr, _width - ((_diameter/2.0) + 4.0), _height/2.0);
+				cairo_translate (cr, get_width() - ((_diameter/2.0) + 4.0), get_height()/2.0);
 			}
 		} else {
-			cairo_translate (cr, _width/2.0, _height/2.0);
+			cairo_translate (cr, get_width()/2.0, get_height()/2.0);
 		}
 		
 		//inset
@@ -192,29 +332,38 @@ ArdourButton::render (cairo_t* cr)
 		cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
 		cairo_fill(cr);
 		
-		//reflection
-		cairo_scale(cr, 0.7, 0.7);
-		cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
-		cairo_set_source (cr, reflection_pattern);
-		cairo_fill (cr);
-
 		cairo_restore (cr);
-
 	}
 
+
 	/* a partially transparent gray layer to indicate insensitivity */
 
 	if ((visual_state() & Gtkmm2ext::Insensitive)) {
-		cairo_rectangle (cr, 0, 0, _width, _height);
-		cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.5);
+		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
+		cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.5);
 		cairo_fill (cr);
 	}
-}
 
-void
-ArdourButton::state_handler ()
-{
-	set_colors ();
+	//reflection
+	bool show_reflection = (active_state() == Gtkmm2ext::ExplicitActive);
+	show_reflection &= !_flat_buttons;
+	show_reflection &= !((_elements & Indicator)==Indicator);
+	if ( show_reflection ) {
+		float rheight = get_height()*0.5-REFLECTION_HEIGHT;
+		Gtkmm2ext::rounded_rectangle (cr, 2, get_height()*0.5-1, get_width()-4, rheight, _corner_radius-1);
+		cairo_set_source (cr, shine_pattern);
+		cairo_fill (cr);
+	}
+
+	/* if requested, show hovering */
+	
+	if (ARDOUR::Config->get_widget_prelight()) {
+		if (_hovering) {
+			rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
+			cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2);
+			cairo_fill (cr);
+		}
+	}
 }
 
 void
@@ -256,12 +405,26 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
 		_text_height = 0;
 	}
 
+	if (_pixbuf) {
+		xpad = 6;
+	}
+
         if ((_elements & Indicator) && _fixed_diameter) {
-                req->width = _text_width + lrint (_diameter) + xpad;
-                req->height = max (_text_height, (int) lrint (_diameter)) + ypad;
+		if (_pixbuf) {
+			req->width = _pixbuf->get_width() + lrint (_diameter) + xpad;
+			req->height = max (_pixbuf->get_height(), (int) lrint (_diameter)) + ypad;
+		} else {
+			req->width = _text_width + lrint (_diameter) + xpad;
+			req->height = max (_text_height, (int) lrint (_diameter)) + ypad;
+		}
         } else {
-                req->width = _text_width + xpad;
-                req->height = _text_height + ypad;
+		if (_pixbuf) {
+			req->width = _pixbuf->get_width() + xpad;
+			req->height = _pixbuf->get_height() + ypad;
+		}  else {
+			req->width = _text_width + xpad;
+			req->height = _text_height + ypad;
+		}
 	}
 }
 
@@ -274,55 +437,83 @@ ArdourButton::set_colors ()
 	uint32_t text_color;
 	uint32_t led_color;
 
-	/* we use the edge of the button to show Selected state, so the
-	 * color/pattern used there will vary depending on that
-	 */
-	
-	if (edge_pattern) {
-		cairo_pattern_destroy (edge_pattern);
+	if (active_state() == Gtkmm2ext::ImplicitActive && (_tweaks & ImplicitUsesSolidColor)) {
+		fill_color_active = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name()));
+	} else {
+		fill_color_active = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
 	}
+	fill_color_inactive = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+	border_color = ARDOUR_UI::config()->color_by_name ( "button border" );
 
-	if (_elements & Edge) {
-
-		edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height);
-		if (visual_state() & Gtkmm2ext::Selected) {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start selected", get_name()));
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end selected", get_name()));
-		} else {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start", get_name()));
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end", get_name()));
-		}
-		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7);
-		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
-		cairo_pattern_add_color_stop_rgba (edge_pattern, 1, r/255.0,g/255.0,b/255.0, 0.7);
+	if (shine_pattern) {
+		cairo_pattern_destroy (shine_pattern);
+		shine_pattern = 0;
 	}
 
-
-	/* the fill pattern is used to indicate Normal/Active/Mid state
-	 */
-
 	if (fill_pattern) {
 		cairo_pattern_destroy (fill_pattern);
+		fill_pattern = 0;
+	}
+
+	if (fill_pattern_active) {
+		cairo_pattern_destroy (fill_pattern_active);
+		fill_pattern_active = 0;
 	}
 
 	if (_elements & Body) {
-		fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height);
+
+		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
 		
-		if (active_state() == Gtkmm2ext::Mid) {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start mid", get_name()));
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end mid", get_name()));
-		} else if (active_state() == Gtkmm2ext::Active) {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start active", get_name()));
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end active", get_name()));
+		if (_flat_buttons) {
+			end_color = start_color;
+		} else {
+			end_color = fill_color_active;
+		}
+		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
+
+		active_r = r/255.0;
+		active_g = g/255.0;
+		active_b = b/255.0;
+		active_a = a/255.0;
+
+		shine_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 0, 1,1,1,0.0);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 0.5, 1,1,1,0.1);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 0.7, 1,1,1,0.2);
+		cairo_pattern_add_color_stop_rgba (shine_pattern, 1, 1,1,1,0.1);
+
+		fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
+		if (_flat_buttons) {
+			end_color = start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
 		} else {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start", get_name()));
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end", get_name()));
+			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
+			end_color = fill_color_inactive;
 		}
 		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
 		cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
 		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
 		cairo_pattern_add_color_stop_rgba (fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+
+		fill_pattern_active = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
+		if (_flat_buttons) {
+			if (active_state() == Gtkmm2ext::ImplicitActive && (_tweaks & ImplicitUsesSolidColor)) {
+				end_color = start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name()));
+			} else {
+				end_color = start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+			}
+		} else {
+			if (active_state() == Gtkmm2ext::ImplicitActive && (_tweaks & ImplicitUsesSolidColor)) {
+				start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led", get_name()));
+				end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name()));
+			} else {
+				start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
+				end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+			}
+		}
+		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
+		cairo_pattern_add_color_stop_rgba (fill_pattern_active, 0, r/255.0,g/255.0,b/255.0, a/255.0);
+		UINT_TO_RGBA (end_color, &r, &g, &b, &a);
+		cairo_pattern_add_color_stop_rgba (fill_pattern_active, 1, r/255.0,g/255.0,b/255.0, a/255.0);
 	}
 
 	if (led_inset_pattern) {
@@ -343,17 +534,14 @@ ArdourButton::set_colors ()
 		cairo_pattern_add_color_stop_rgba (reflection_pattern, 1, 1,1,1, 0.0);
 	}
 	
-	/* text and LED colors depend on Active/Normal/Mid */
-
-	if (active_state() == Gtkmm2ext::Active) {
-		text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text active", get_name()));
-		led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led active", get_name()));
-	} else if (active_state() == Gtkmm2ext::Mid) {
-		text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text mid", get_name()));
-		led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led mid", get_name()));
+	/* text and LED colors */
+
+	if (active_state() == Gtkmm2ext::ExplicitActive || ((_tweaks & ImplicitUsesSolidColor) && active_state() == Gtkmm2ext::ImplicitActive)) {
+		text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text active", get_name()));
+		led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name()));
 	} else {
-		text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text", get_name()));
-		led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led", get_name()));
+		text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text", get_name()));
+		led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led", get_name()));
 	}
 
 	UINT_TO_RGBA (text_color, &r, &g, &b, &a);
@@ -386,6 +574,10 @@ ArdourButton::on_button_press_event (GdkEventButton *ev)
 		}
 	}
 
+	if (_tweaks & ShowClick) {
+		set_active_state (Gtkmm2ext::ExplicitActive);
+	}
+
 	if (binding_proxy.button_press_handler (ev)) {
 		return true;
 	}
@@ -411,6 +603,12 @@ ArdourButton::on_button_release_event (GdkEventButton *ev)
 		}
 	}
 
+	if (_tweaks & ShowClick) {
+		unset_active_state ();
+	}
+
+	signal_clicked ();
+
 	if (_act_on_release) {
 		if (_action) {
 			_action->activate ();
@@ -418,6 +616,7 @@ ArdourButton::on_button_release_event (GdkEventButton *ev)
 		}
 	}
 
+
 	return false;
 }
 
@@ -469,7 +668,7 @@ ArdourButton::controllable_changed ()
         float val = binding_proxy.get_controllable()->get_value();
 
 	if (fabs (val) >= 0.5f) {
-		set_active_state (Gtkmm2ext::Active);
+		set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
 		unset_active_state ();
 	}
@@ -478,11 +677,21 @@ ArdourButton::controllable_changed ()
 void
 ArdourButton::set_related_action (RefPtr<Action> act)
 {
-	_action = act;
+	Gtkmm2ext::Activatable::set_related_action (act);
 
-	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
-	if (tact) {
-		tact->signal_toggled().connect (sigc::mem_fun (*this, &ArdourButton::action_toggled));
+	if (_action) {
+
+		action_tooltip_changed ();
+
+		Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
+		if (tact) {
+			action_toggled ();
+			tact->signal_toggled().connect (sigc::mem_fun (*this, &ArdourButton::action_toggled));
+		} 
+
+		_action->connect_property_changed ("sensitive", sigc::mem_fun (*this, &ArdourButton::action_sensitivity_changed));
+		_action->connect_property_changed ("visible", sigc::mem_fun (*this, &ArdourButton::action_visibility_changed));
+		_action->connect_property_changed ("tooltip", sigc::mem_fun (*this, &ArdourButton::action_tooltip_changed));
 	}
 }
 
@@ -493,7 +702,7 @@ ArdourButton::action_toggled ()
 
 	if (tact) {
 		if (tact->get_active()) {
-			set_active_state (Gtkmm2ext::Active);
+			set_active_state (Gtkmm2ext::ExplicitActive);
 		} else {
 			unset_active_state ();
 		}
@@ -511,7 +720,7 @@ ArdourButton::setup_led_rect ()
 {
 	int text_margin;
 
-	if (_width < 75) {
+	if (get_width() < 75) {
 		text_margin = 3;
 	} else {
 		text_margin = 10;
@@ -524,14 +733,14 @@ ArdourButton::setup_led_rect ()
 			if (_led_left) {
 				_led_rect->x = text_margin;
 			} else {
-				_led_rect->x = _width - text_margin - _diameter/2.0;
+				_led_rect->x = get_width() - text_margin - _diameter/2.0;
 			}
 		} else {
 			/* centered */
-			_led_rect->x = _width/2.0 - _diameter/2.0;
+			_led_rect->x = get_width()/2.0 - _diameter/2.0;
 		}
 
-		_led_rect->y = _height/2.0 - _diameter/2.0;
+		_led_rect->y = get_height()/2.0 - _diameter/2.0;
 		_led_rect->width = _diameter;
 		_led_rect->height = _diameter;
 
@@ -541,3 +750,118 @@ ArdourButton::setup_led_rect ()
 	}
 }
 
+void
+ArdourButton::set_image (const RefPtr<Gdk::Pixbuf>& img)
+{
+	_pixbuf = img;
+	queue_draw ();
+}
+
+void
+ArdourButton::set_active_state (Gtkmm2ext::ActiveState s)
+{
+	bool changed = (_active_state != s);
+	CairoWidget::set_active_state (s);
+	if (changed) {
+		set_colors ();
+	}
+}
+	
+void
+ArdourButton::set_visual_state (Gtkmm2ext::VisualState s)
+{
+	bool changed = (_visual_state != s);
+	CairoWidget::set_visual_state (s);
+	if (changed) {
+		set_colors ();
+	}
+}
+	
+bool
+ArdourButton::on_enter_notify_event (GdkEventCrossing* ev)
+{
+	_hovering = true;
+
+	if (ARDOUR::Config->get_widget_prelight()) {
+		queue_draw ();
+	}
+
+	return CairoWidget::on_enter_notify_event (ev);
+}
+
+bool
+ArdourButton::on_leave_notify_event (GdkEventCrossing* ev)
+{
+	_hovering = false;
+
+	if (ARDOUR::Config->get_widget_prelight()) {
+		queue_draw ();
+	}
+
+	return CairoWidget::on_leave_notify_event (ev);
+}
+
+void
+ArdourButton::set_tweaks (Tweaks t)
+{
+	if (_tweaks != t) {
+		_tweaks = t;
+		queue_draw ();
+	}
+}
+
+void
+ArdourButton::action_sensitivity_changed ()
+{
+	if (_action->property_sensitive ()) {
+		set_visual_state (Gtkmm2ext::VisualState (visual_state() & ~Gtkmm2ext::Insensitive));
+	} else {
+		set_visual_state (Gtkmm2ext::VisualState (visual_state() | Gtkmm2ext::Insensitive));
+	}
+	
+}
+
+
+void
+ArdourButton::action_visibility_changed ()
+{
+	if (_action->property_visible ()) {
+		show ();
+	} else {
+		hide ();
+	}
+}
+
+void
+ArdourButton::action_tooltip_changed ()
+{
+	string str = _action->property_tooltip().get_value();
+	ARDOUR_UI::instance()->set_tip (*this, str);
+}
+
+void
+ArdourButton::set_rounded_corner_mask (int mask)
+{
+	_corner_mask = mask;
+	queue_draw ();
+}
+
+void
+ArdourButton::set_elements (Element e)
+{
+	_elements = e;
+	set_colors ();
+}
+
+void
+ArdourButton::add_elements (Element e)
+{
+	_elements = (ArdourButton::Element) (_elements | e);
+	set_colors ();
+}
+
+void
+ArdourButton::set_flat_buttons (bool yn)
+{
+	_flat_buttons = yn;
+}