X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_button.cc;h=56854880d851c69285d5008e4099cfc67c99c132;hb=b8f5306d5bf59ddb237fabcdbab91a7d1e6fd612;hp=3042796acc1f46316947aa8782885d79cc3eea33;hpb=98404c6e623da82f19c813497517be3326780234;p=ardour.git

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 3042796acc..56854880d8 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -24,6 +24,7 @@
 #include <pangomm/layout.h>
 
 #include "pbd/compose.h"
+#include "pbd/controllable.h"
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
@@ -31,22 +32,23 @@
 #include "gtkmm2ext/rgb_macros.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "ardour/rc_configuration.h" // for widget prelight preference
-
 #include "canvas/utils.h"
+#include "canvas/colors.h"
 
 #include "ardour_button.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
+#include "tooltips.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
-#define REFLECTION_HEIGHT 2
+#define BASELINESTRETCH (1.25)
+#define TRACKHEADERBTNW (3.10)
 
 using namespace Gdk;
 using namespace Gtk;
 using namespace Glib;
 using namespace PBD;
+using namespace ARDOUR_UI_UTILS;
 using std::max;
 using std::min;
 using namespace std;
@@ -57,9 +59,11 @@ ArdourButton::Element ArdourButton::just_led_default_elements = ArdourButton::El
 
 ArdourButton::ArdourButton (Element e)
 	: _elements (e)
+	, _icon (Gtkmm2ext::ArdourIcon::NoIcon)
 	, _tweaks (Tweaks (0))
 	, _char_pixel_width (0)
 	, _char_pixel_height (0)
+	, _char_avg_pixel_width (0)
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (0)
@@ -74,6 +78,8 @@ ArdourButton::ArdourButton (Element e)
 	, text_inactive_color(0)
 	, led_active_color(0)
 	, led_inactive_color(0)
+	, led_custom_color (0)
+	, use_custom_led_color (false)
 	, convex_pattern (0)
 	, concave_pattern (0)
 	, led_inset_pattern (0)
@@ -85,13 +91,20 @@ ArdourButton::ArdourButton (Element e)
 	, _focused (false)
 	, _fixed_colors_set (false)
 	, _fallthrough_to_parent (false)
+	, _layout_ellipsize_width (-1)
+	, _ellipsis (Pango::ELLIPSIZE_NONE)
+	, _update_colors (true)
+	, _pattern_height (0)
 {
-	ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
 }
 
 ArdourButton::ArdourButton (const std::string& str, Element e)
 	: _elements (e)
 	, _tweaks (Tweaks (0))
+	, _char_pixel_width (0)
+	, _char_pixel_height (0)
+	, _char_avg_pixel_width (0)
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (0)
@@ -106,6 +119,8 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
 	, text_inactive_color(0)
 	, led_active_color(0)
 	, led_inactive_color(0)
+	, led_custom_color (0)
+	, use_custom_led_color (false)
 	, convex_pattern (0)
 	, concave_pattern (0)
 	, led_inset_pattern (0)
@@ -116,8 +131,15 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
 	, _hovering (false)
 	, _focused (false)
 	, _fixed_colors_set (false)
+	, _fallthrough_to_parent (false)
+	, _layout_ellipsize_width (-1)
+	, _ellipsis (Pango::ELLIPSIZE_NONE)
+	, _update_colors (true)
+	, _pattern_height (0)
 {
 	set_text (str);
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
+	UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
 }
 
 ArdourButton::~ArdourButton()
@@ -135,36 +157,33 @@ ArdourButton::~ArdourButton()
 	if (led_inset_pattern) {
 		cairo_pattern_destroy (led_inset_pattern);
 	}
-
 }
 
 void
-ArdourButton::set_text (const std::string& str)
+ArdourButton::set_layout_font (const Pango::FontDescription& fd)
 {
-	_text = str;
-
-	if (!_layout && !_text.empty()) {
-		_layout = Pango::Layout::create (get_pango_context());
-	}
-
+	ensure_layout ();
 	if (_layout) {
-		_layout->set_text (str);
+		_layout->set_font_description (fd);
+		queue_resize ();
 	}
-
-	queue_resize ();
 }
 
 void
-ArdourButton::set_markup (const std::string& str)
+ArdourButton::set_text (const std::string& str)
 {
+	if (_text == str) {
+		return;
+	}
 	_text = str;
-
-	if (!_layout) {
-		_layout = Pango::Layout::create (get_pango_context());
+	if (!is_realized()) {
+		return;
+	}
+	ensure_layout ();
+	if (_layout && _layout->get_text() != _text) {
+		_layout->set_text (_text);
+		queue_resize ();
 	}
-
-	_layout->set_markup (str);
-	queue_resize ();
 }
 
 void
@@ -180,11 +199,31 @@ ArdourButton::set_alignment (const float xa, const float ya)
 	_yalign = ya;
 }
 
+
+/* TODO make this a dedicated function elsewhere.
+ *
+ * Option 1:
+ * virtual ArdourButton::render_vector_icon()
+ * ArdourIconButton::render_vector_icon
+ *
+ * Option 2:
+ * ARDOUR_UI_UTILS::render_vector_icon()
+ */
 void
 ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 {
 	uint32_t text_color;
 	uint32_t led_color;
+
+	const float corner_radius = std::max(2.f, _corner_radius * UIConfiguration::instance().get_ui_scale());
+
+	if (_update_colors) {
+		set_colors ();
+	}
+	if (get_height() != _pattern_height) {
+		build_patterns ();
+	}
+
 	if ( active_state() == Gtkmm2ext::ExplicitActive ) {
 		text_color = text_active_color;
 		led_color = led_active_color;
@@ -193,6 +232,10 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 		led_color = led_inactive_color;
 	}
 
+	if (use_custom_led_color) {
+		led_color = led_custom_color;
+	}
+
 	void (*rounded_function)(cairo_t*, double, double, double, double, double);
 
 	switch (_corner_mask) {
@@ -214,14 +257,14 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 
 	// draw edge (filling a rect underneath, rather than stroking a border on top, allows the corners to be lighter-weight.
 	if ((_elements & (Body|Edge)) == (Body|Edge)) {
-		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius + 1.5);
+		rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5);
 		cairo_set_source_rgba (cr, 0, 0, 0, 1);
 		cairo_fill(cr);
 	}
 
 	// background fill
 	if ((_elements & Body)==Body) {
-		rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+		rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
 		if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) {
 			ArdourCanvas::set_source_rgba (cr, fill_inactive_color);
 			cairo_fill (cr);
@@ -240,22 +283,22 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 	if ((_elements & Body)==Body) {
 		if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) {
 			cairo_set_line_width (cr, 2.0);
-			rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, _corner_radius-0.5);
+			rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, corner_radius-0.5);
 			ArdourCanvas::set_source_rgba (cr, fill_active_color);
 			cairo_stroke (cr);
 		}
 	}
 
 	//show the "convex" or "concave" gradient
-	if (!_flat_buttons) {
-		if ( active_state() == Gtkmm2ext::ExplicitActive && !((_elements & Indicator)==Indicator) ) {
+	if (!_flat_buttons && (_elements & Body)==Body) {
+		if ( active_state() == Gtkmm2ext::ExplicitActive && ( !((_elements & Indicator)==Indicator) || use_custom_led_color) ) {
 			//concave
 			cairo_set_source (cr, concave_pattern);
-			Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+			Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
 			cairo_fill (cr);
 		} else {
 			cairo_set_source (cr, convex_pattern);
-			Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+			Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
 			cairo_fill (cr);
 		}
 	}
@@ -264,7 +307,14 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 	if (_pixbuf) {
 		double x = rint((get_width() - _pixbuf->get_width()) * .5);
 		const double y = rint((get_height() - _pixbuf->get_height()) * .5);
-
+#if 0 // DEBUG style (print on hover)
+		if (_hovering || (_elements & Inactive)) {
+			printf("%s: p:%dx%d (%dx%d)\n",
+					get_name().c_str(),
+					_pixbuf->get_width(), _pixbuf->get_height(),
+					get_width(), get_height());
+		}
+#endif
 		if (_elements & Menu) {
 			//if this is a DropDown with an icon, then we need to
 			//move the icon left slightly to accomomodate the arrow
@@ -274,95 +324,33 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 		gdk_cairo_set_source_pixbuf (cr, _pixbuf->gobj(), x, y);
 		cairo_fill (cr);
 	}
-	else // rec-en is exclusive to pixbuf (tape machine mode, rec-en)
-	if ((_elements & (RecButton|RecTapeMode)) == (RecButton|RecTapeMode)) {
-		const double x = get_width() * .5;
-		const double y = get_height() * .5;
-		const double r = std::min(10., std::min(x, y) * .6); // TODO we need a better way to limit max. radius.
-		const double slit = .11 * M_PI;
-		cairo_save(cr);
-		cairo_translate(cr, x, y);
-
-		cairo_arc (cr, 0, 0, r, 0, 2 * M_PI);
-		if (active_state() == Gtkmm2ext::ExplicitActive)
-			cairo_set_source_rgba (cr, .95, .1, .1, 1.);
-		else
-			cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
-		cairo_fill_preserve(cr);
-		cairo_set_source_rgba (cr, .0, .0, .0, .5);
-		cairo_set_line_width(cr, 1);
-		cairo_stroke(cr);
-
-		cairo_save(cr);
-		cairo_set_source_rgba (cr, .15, .07, .07, 1.0);
-
-		cairo_rotate (cr, -.5 * M_PI);
-		cairo_move_to(cr, 0, 0);
-		cairo_arc (cr, 0, 0, r *.85, -slit, slit);
-		cairo_line_to(cr, 0, 0);
-		cairo_close_path(cr);
-
-		cairo_fill(cr);
-		cairo_rotate (cr, 2. * M_PI / 3.);
-
-		cairo_move_to(cr, 0, 0);
-		cairo_arc (cr, 0, 0, r *.85, -slit, slit);
-		cairo_line_to(cr, 0, 0);
-		cairo_close_path(cr);
-		cairo_fill(cr);
-
-		cairo_rotate (cr, 2. * M_PI / 3.);
-		cairo_move_to(cr, 0, 0);
-		cairo_arc (cr, 0, 0, r *.85, -slit, slit);
-		cairo_line_to(cr, 0, 0);
-		cairo_close_path(cr);
-		cairo_fill(cr);
-
-		cairo_restore(cr);
-
-		cairo_arc (cr, 0, 0, r * .3, 0, 2 * M_PI);
-		if (active_state() == Gtkmm2ext::ExplicitActive)
-			cairo_set_source_rgba (cr, .95, .1, .1, 1.);
-		else
-			cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
-		cairo_fill(cr);
-		cairo_set_source_rgba (cr, .0, .0, .0, 1.0);
-		cairo_arc (cr, 0, 0, r *.15, 0, 2 * M_PI); // hole in the middle
-		cairo_fill(cr);
-
-		cairo_restore(cr);
-	}
-	else if (_elements & RecButton) {
-		const double x = get_width() * .5;
-		const double y = get_height() * .5;
-		const double r = std::min(10., std::min(x, y) * .55); // TODO we need a better way to limit max. radius.
-		cairo_arc (cr, x, y, r, 0, 2 * M_PI);
-		if (active_state() == Gtkmm2ext::ExplicitActive)
-			cairo_set_source_rgba (cr, .95, .1, .1, 1.);
-		else
-			cairo_set_source_rgba (cr, .95, .44, .44, 1.); // #f46f6f
-		cairo_fill_preserve(cr);
-		cairo_set_source_rgba (cr, .0, .0, .0, .8);
-		cairo_set_line_width(cr, 1);
-		cairo_stroke(cr);
-	}
-	else if (_elements & CloseCross) {
-		const double x = get_width() * .5;
-		const double y = get_height() * .5;
-		const double o = .5 + std::min(x, y) * .4;
-		ArdourCanvas::set_source_rgba (cr, text_color);
-		cairo_set_line_width(cr, 1);
-		cairo_move_to(cr, x-o, y-o);
-		cairo_line_to(cr, x+o, y+o);
-		cairo_move_to(cr, x+o, y-o);
-		cairo_line_to(cr, x-o, y+o);
-		cairo_stroke(cr);
+	else /* VectorIcons are exclusive to Pixbuf Icons */
+	if (_elements & VectorIcon) {
+		Gtkmm2ext::ArdourIcon::render (cr, _icon, get_width(), get_height(), active_state(), text_color);
 	}
 
-	const int text_margin = rint(.5 * (char_pixel_width() + _corner_radius));
-
+	const int text_margin = char_pixel_width();
 	// Text, if any
 	if (!_pixbuf && ((_elements & Text)==Text) && !_text.empty()) {
+		assert(_layout);
+#if 0 // DEBUG style (print on hover)
+		if (_hovering || (_elements & Inactive)) {
+			bool layout_font = true;
+			Pango::FontDescription fd = _layout->get_font_description();
+			if (fd.gobj() == NULL) {
+				layout_font = false;
+				fd = get_pango_context()->get_font_description();
+			}
+			printf("%s: f:%dx%d aw:%.3f bh:%.0f t:%dx%d (%dx%d) %s\"%s\"\n",
+					get_name().c_str(),
+					char_pixel_width(), char_pixel_height(), char_avg_pixel_width(),
+					ceil(char_pixel_height() * BASELINESTRETCH),
+					_text_width, _text_height,
+					get_width(), get_height(),
+					layout_font ? "L:" : "W:",
+					fd.to_string().c_str());
+		}
+#endif
 
 		cairo_save (cr);
 		cairo_rectangle (cr, 2, 1, get_width() - 4, get_height() - 2);
@@ -370,17 +358,18 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 
 		cairo_new_path (cr);
 		ArdourCanvas::set_source_rgba (cr, text_color);
+		const double text_ypos = (get_height() - _text_height) * .5;
 
 		if (_elements & Menu) {
 			// always left align (dropdown)
-			cairo_move_to (cr, text_margin, rint((get_height() - _text_height) * .5));
+			cairo_move_to (cr, text_margin, text_ypos);
 			pango_cairo_show_layout (cr, _layout->gobj());
 		} else if ( (_elements & Indicator)  == Indicator) {
 			// left/right align depending on LED position
 			if (_led_left) {
-				cairo_move_to (cr, rint(text_margin + _diameter + char_pixel_width()), rint((get_height() - _text_height) * .5));
+				cairo_move_to (cr, text_margin + _diameter + .5 * char_pixel_width(), text_ypos);
 			} else {
-				cairo_move_to (cr, text_margin, rint((get_height() - _text_height) * .5));
+				cairo_move_to (cr, text_margin, text_ypos);
 			}
 			pango_cairo_show_layout (cr, _layout->gobj());
 		} else {
@@ -400,9 +389,9 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 			 * TODO this should be generalized incl rotation.
 			 * currently only 'user' of this API is meter_strip.cc
 			 */
-			if (_xalign < 0) xa = .5 + (ww * fabs(_xalign) + text_margin);
+			if (_xalign < 0) xa = ceil(.5 + (ww * fabs(_xalign) + text_margin));
 
-			cairo_move_to (cr, rint(xa), rint(ya));
+			cairo_move_to (cr, xa, ya);
 			pango_cairo_update_layout(cr, _layout->gobj());
 			pango_cairo_show_layout (cr, _layout->gobj());
 			cairo_restore (cr);
@@ -458,52 +447,48 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 
 		//black ring
 		cairo_set_source_rgb (cr, 0, 0, 0);
-		cairo_arc (cr, 0, 0, _diameter * .5 - 1, 0, 2 * M_PI);
+		cairo_arc (cr, 0, 0, _diameter * .5 - 1 * UIConfiguration::instance().get_ui_scale(), 0, 2 * M_PI);
 		cairo_fill(cr);
 
 		//led color
 		ArdourCanvas::set_source_rgba (cr, led_color);
-		cairo_arc (cr, 0, 0, _diameter * .5 - 3, 0, 2 * M_PI);
+		cairo_arc (cr, 0, 0, _diameter * .5 - 3 * UIConfiguration::instance().get_ui_scale(), 0, 2 * M_PI);
 		cairo_fill(cr);
 
 		cairo_restore (cr);
 	}
 
-	// a transparent gray layer to indicate insensitivity
+	// a transparent overlay to indicate insensitivity
 	if ((visual_state() & Gtkmm2ext::Insensitive)) {
-		rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
-		cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.6);
+		rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius);
+		uint32_t ins_color = UIConfiguration::instance().color ("gtk_background");
+		ArdourCanvas::set_source_rgb_a (cr, ins_color, 0.6);
 		cairo_fill (cr);
 	}
 
 	// if requested, show hovering
-	if (ARDOUR::Config->get_widget_prelight()
+	if (UIConfiguration::instance().get_widget_prelight()
 			&& !((visual_state() & Gtkmm2ext::Insensitive))) {
 		if (_hovering) {
-			rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+			rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
 			cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2);
 			cairo_fill (cr);
 		}
 	}
 
-	//user is currently pressing the button.  black outline helps to indicate this
+	//user is currently pressing the button. dark outline helps to indicate this
 	if (_grabbed && !(_elements & (Inactive|Menu))) {
-		rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius);
+		rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, corner_radius);
 		cairo_set_line_width(cr, 2);
-		cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, .5); // XXX no longer 'black'
+		cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, .5);
 		cairo_stroke (cr);
 	}
 
 	//some buttons (like processor boxes) can be selected  (so they can be deleted).  Draw a selection indicator
 	if (visual_state() & Gtkmm2ext::Selected) {
-#if 0 // outline, edge + 1px outside
-		cairo_set_line_width(cr, 2);
-		cairo_set_source_rgba (cr, 1, 0, 0, 0.8);
-#else // replace edge (if any)
 		cairo_set_line_width(cr, 1);
 		cairo_set_source_rgba (cr, 1, 0, 0, 0.8);
-#endif
-		rounded_function (cr, 0.5, 0.5, get_width() - 1, get_height() - 1, _corner_radius);
+		rounded_function (cr, 0.5, 0.5, get_width() - 1, get_height() - 1, corner_radius);
 		cairo_stroke (cr);
 	}
 
@@ -513,7 +498,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 	//   (the editor is always the first receiver for KeyDown).
 	//   It's needed for eg. the engine-dialog at startup or after closing a sesion.
 	if (_focused) {
-		rounded_function (cr, 1.5, 1.5, get_width() - 3, get_height() - 3, _corner_radius);
+		rounded_function (cr, 1.5, 1.5, get_width() - 3, get_height() - 3, corner_radius);
 		cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.8);
 		double dashes = 1;
 		cairo_set_dash (cr, &dashes, 1, 0);
@@ -525,38 +510,71 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 }
 
 void
-ArdourButton::set_diameter (float d)
+ArdourButton::set_corner_radius (float r)
 {
-	_diameter = (d*2) + 5.0;
-
-	build_patterns ();
-	queue_resize ();
+	_corner_radius = r;
+	CairoWidget::set_dirty ();
 }
 
 void
-ArdourButton::set_corner_radius (float r)
+ArdourButton::on_realize()
 {
-	_corner_radius = r;
-	set_dirty ();
+	CairoWidget::on_realize ();
+	ensure_layout ();
+	if (_layout && _layout->get_text() != _text) {
+		_layout->set_text (_text);
+		queue_resize ();
+	}
 }
 
 void
 ArdourButton::on_size_request (Gtk::Requisition* req)
 {
-	req->height = req->height = 0;
+	req->width = req->height = 0;
 	CairoWidget::on_size_request (req);
 
 	if (_diameter == 0) {
-		_diameter = rint (ARDOUR::Config->get_font_scale () / 1024. / 7.5); // 11px with 80% font-scaling
+		const float newdia = rintf (11.f * UIConfiguration::instance().get_ui_scale());
+		if (_diameter != newdia) {
+			_pattern_height = 0;
+			_diameter = newdia;
+		}
 	}
 
-	if ((_elements & Text) && !_text.empty()) {
-		int ignored;
-		_layout->get_pixel_size (_text_width, ignored);
-		_text_height = char_pixel_height ();
-		req->width += char_pixel_width();
-		req->width += _text_width;
-		req->height = std::max(req->height, (int) ceil(_text_height * 1.25));
+	if (_elements & Text) {
+
+		if (_tweaks & OccasionalText) {
+
+			/* size should not change based on presence or absence
+			 * of text.
+			 */
+
+			if (!_text.empty()) {
+				ensure_layout ();
+				_layout->set_text (_text);
+				_layout->get_pixel_size (_text_width, _text_height);
+			}
+
+		} else if (!_text.empty()) {
+
+			//if _layout does not exist, char_pixel_height() creates it,
+
+			req->height = std::max(req->height, (int) ceil(char_pixel_height() * BASELINESTRETCH + 1.0));
+			assert (_layout);
+			_layout->get_pixel_size (_text_width, _text_height);
+			req->width += rint(1.75 * char_pixel_width()); // padding
+			req->width += _text_width;
+		}
+
+		/* XXX hack (surprise). Deal with two common rotation angles */
+
+		if (_angle == 90 || _angle == 270) {
+			/* do not swap text width or height because we rely on
+			   these being the un-rotated values in ::render()
+			*/
+			swap (req->width, req->height);
+		}
+
 	} else {
 		_text_width = 0;
 		_text_height = 0;
@@ -568,36 +586,45 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
 	}
 
 	if (_elements & Indicator) {
-		req->width += lrint (_diameter) + 2 * char_pixel_width();
-		req->height = std::max (req->height, (int) lrint (_diameter) + 2);
+		req->width += lrint (_diameter) + char_pixel_width();
+		req->height = std::max (req->height, (int) lrint (_diameter) + 4);
 	}
 
 	if ((_elements & Menu)) {
 		req->width += _diameter + 4;
 	}
 
-	if (_elements & (RecButton | CloseCross)) {
+	if (_elements & VectorIcon) {
 		assert(!(_elements & Text));
-		const int wh = std::max(char_pixel_width(), char_pixel_height()) * 1.25;
+		const int wh = std::max (6., std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.)));
 		req->width += wh;
-		req->height = std::max(req->height, (int) wh);
+		req->height = std::max(req->height, wh);
 	}
 
-	req->width += ceil(_corner_radius);
-	req->height += ceil(_corner_radius);
-
-	if (_tweaks & Square) {
-		// squared buttons are also grouped, we cannot align all texts
-		// -> skip proper center adjustment
+	/* Tweaks to mess the nice stuff above up again. */
+	if (_tweaks & TrackHeader) {
+		// forget everything above and just use a fixed square [em] size
+		// "TrackHeader Buttons" are single letter (usually uppercase)
+		// a SizeGroup is much less efficient (lots of gtk work under the hood for each track)
+		const int wh = std::max (rint (TRACKHEADERBTNW * char_avg_pixel_width()), ceil (char_pixel_height() * BASELINESTRETCH + 1.));
+		req->width  = wh;
+		req->height = wh;
+	}
+	else if (_tweaks & Square) {
+		// currerntly unused (again)
 		if (req->width < req->height)
 			req->width = req->height;
 		if (req->height < req->width)
 			req->height = req->width;
-	} else if (! (_elements & (Menu | Indicator))) {
+	} else if (_text_width > 0 && !(_elements & (Menu | Indicator))) {
 		// properly centered text for those elements that are centered
+		// (no sub-pixel offset)
 		if ((req->width - _text_width) & 1) { ++req->width; }
 		if ((req->height - _text_height) & 1) { ++req->height; }
 	}
+#if 0
+		printf("REQ: %s: %dx%d\n", get_name().c_str(), req->width, req->height);
+#endif
 }
 
 /**
@@ -607,20 +634,47 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
 void
 ArdourButton::set_colors ()
 {
-	if (_fixed_colors_set) {
+	_update_colors = false;
+
+	if (_fixed_colors_set == 0x3) {
 		return;
 	}
+
 	std::string name = get_name();
+	bool failed = false;
+
+	if (!(_fixed_colors_set & 0x1)) {
+		fill_active_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
+		if (failed) {
+			fill_active_color = UIConfiguration::instance().color ("generic button: fill active");
+		}
+	}
+
+	if (!(_fixed_colors_set & 0x2)) {
+		fill_inactive_color = UIConfiguration::instance().color (string_compose ("%1: fill", name), &failed);
+		if (failed) {
+			fill_inactive_color = UIConfiguration::instance().color ("generic button: fill");
+		}
+	}
+
+	text_active_color = ArdourCanvas::contrasting_text_color (fill_active_color);
+	text_inactive_color = ArdourCanvas::contrasting_text_color (fill_inactive_color);
+
+	led_active_color = UIConfiguration::instance().color (string_compose ("%1: led active", name), &failed);
+	if (failed) {
+		led_active_color = UIConfiguration::instance().color ("generic button: led active");
+	}
 
-	fill_active_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill active", name));
-	fill_inactive_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill", name));
+	/* The inactive color for the LED is just a fairly dark version of the
+	 * active color.
+	 */
 
-	text_active_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text active", name));
-	text_inactive_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text", name));
+	ArdourCanvas::HSV inactive (led_active_color);
+	inactive.v = 0.35;
 
-	led_active_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", name));
-	led_inactive_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led", name));
+	led_inactive_color = inactive.color ();
 }
+
 /**
  * This sets the colors used for rendering based on two fixed values, rather
  * than basing them on the button name, and thus information in the GUI config
@@ -628,13 +682,18 @@ ArdourButton::set_colors ()
  */
 void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t color_inactive)
 {
-	_fixed_colors_set = true;
+	set_active_color (color_active);
+	set_inactive_color (color_inactive);
+}
 
-	fill_active_color = color_active;
-	fill_inactive_color = color_inactive;
+void ArdourButton::set_active_color (const uint32_t color)
+{
+	_fixed_colors_set |= 0x1;
+
+	fill_active_color = color;
 
 	unsigned char r, g, b, a;
-	UINT_TO_RGBA(color_active, &r, &g, &b, &a);
+	UINT_TO_RGBA(color, &r, &g, &b, &a);
 
 	double white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
 		(max (double(g), 255.) - min (double(g), 255.)) +
@@ -648,14 +707,24 @@ void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t
 		RGBA_TO_UINT(255, 255, 255, 255) : /* use white */
 		RGBA_TO_UINT(  0,   0,   0,   255);  /* use black */
 
+	/* XXX what about led colors ? */
+	CairoWidget::set_dirty ();
+}
 
-	UINT_TO_RGBA(color_inactive, &r, &g, &b, &a);
+void ArdourButton::set_inactive_color (const uint32_t color)
+{
+	_fixed_colors_set |= 0x2;
 
-	white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
+	fill_inactive_color = color;
+
+	unsigned char r, g, b, a;
+	UINT_TO_RGBA(color, &r, &g, &b, &a);
+
+	double white_contrast = (max (double(r), 255.) - min (double(r), 255.)) +
 		(max (double(g), 255.) - min (double(g), 255.)) +
 		(max (double(b), 255.) - min (double(b), 255.));
 
-	black_contrast = (max (double(r), 0.) - min (double(r), 0.)) +
+	double black_contrast = (max (double(r), 0.) - min (double(r), 0.)) +
 		(max (double(g), 0.) - min (double(g), 0.)) +
 		(max (double(b), 0.) - min (double(b), 0.));
 
@@ -664,9 +733,7 @@ void ArdourButton::set_fixed_colors (const uint32_t color_active, const uint32_t
 		RGBA_TO_UINT(  0,   0,   0,   255);  /* use black */
 
 	/* XXX what about led colors ? */
-
-	build_patterns ();
-	set_name (""); /* this will trigger a "style-changed" message and then set_colors() */
+	CairoWidget::set_dirty ();
 }
 
 void
@@ -684,6 +751,7 @@ ArdourButton::build_patterns ()
 
 	if (led_inset_pattern) {
 		cairo_pattern_destroy (led_inset_pattern);
+		led_inset_pattern = 0;
 	}
 
 	//convex gradient
@@ -696,13 +764,11 @@ ArdourButton::build_patterns ()
 	cairo_pattern_add_color_stop_rgba (concave_pattern, 0.0, 0,0,0, 0.5);
 	cairo_pattern_add_color_stop_rgba (concave_pattern, 0.7, 0,0,0, 0.0);
 
-	if (_elements & Indicator) {
-		led_inset_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
-		cairo_pattern_add_color_stop_rgba (led_inset_pattern, 0, 0,0,0, 0.4);
-		cairo_pattern_add_color_stop_rgba (led_inset_pattern, 1, 1,1,1, 0.7);
-	}
+	led_inset_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
+	cairo_pattern_add_color_stop_rgba (led_inset_pattern, 0, 0,0,0, 0.4);
+	cairo_pattern_add_color_stop_rgba (led_inset_pattern, 1, 1,1,1, 0.7);
 
-	set_dirty ();
+	_pattern_height = get_height() ;
 }
 
 void
@@ -714,7 +780,9 @@ ArdourButton::set_led_left (bool yn)
 bool
 ArdourButton::on_button_press_event (GdkEventButton *ev)
 {
-	if ((_elements & Indicator) && _led_rect && _distinct_led_click) {
+	focus_handler (this);
+
+	if (ev->button == 1 && (_elements & Indicator) && _led_rect && _distinct_led_click) {
 		if (ev->x >= _led_rect->x && ev->x < _led_rect->x + _led_rect->width &&
 		    ev->y >= _led_rect->y && ev->y < _led_rect->y + _led_rect->height) {
 			return true;
@@ -726,9 +794,9 @@ ArdourButton::on_button_press_event (GdkEventButton *ev)
 	}
 
 	_grabbed = true;
-	queue_draw ();
+	CairoWidget::set_dirty ();
 
-	if (!_act_on_release) {
+	if (ev->button == 1 && !_act_on_release) {
 		if (_action) {
 			_action->activate ();
 			return true;
@@ -744,18 +812,18 @@ ArdourButton::on_button_press_event (GdkEventButton *ev)
 bool
 ArdourButton::on_button_release_event (GdkEventButton *ev)
 {
-	if (_hovering && (_elements & Indicator) && _led_rect && _distinct_led_click) {
+	if (ev->button == 1 && _hovering && (_elements & Indicator) && _led_rect && _distinct_led_click) {
 		if (ev->x >= _led_rect->x && ev->x < _led_rect->x + _led_rect->width &&
 		    ev->y >= _led_rect->y && ev->y < _led_rect->y + _led_rect->height) {
-			signal_led_clicked(); /* EMIT SIGNAL */
+			signal_led_clicked(ev); /* EMIT SIGNAL */
 			return true;
 		}
 	}
 
 	_grabbed = false;
-	queue_draw ();
+	CairoWidget::set_dirty ();
 
-	if (_hovering) {
+	if (ev->button == 1 && _hovering) {
 		signal_clicked ();
 		if (_act_on_release) {
 			if (_action) {
@@ -781,9 +849,8 @@ ArdourButton::set_distinct_led_click (bool yn)
 void
 ArdourButton::color_handler ()
 {
-	set_colors ();
-	build_patterns ();
-	set_dirty ();
+	_update_colors = true;
+	CairoWidget::set_dirty ();
 }
 
 void
@@ -791,39 +858,38 @@ ArdourButton::on_size_allocate (Allocation& alloc)
 {
 	CairoWidget::on_size_allocate (alloc);
 	setup_led_rect ();
-	build_patterns ();
 }
 
 void
 ArdourButton::set_controllable (boost::shared_ptr<Controllable> c)
 {
-        watch_connection.disconnect ();
-        binding_proxy.set_controllable (c);
+	watch_connection.disconnect ();
+	binding_proxy.set_controllable (c);
 }
 
 void
 ArdourButton::watch ()
 {
-        boost::shared_ptr<Controllable> c (binding_proxy.get_controllable ());
+	boost::shared_ptr<Controllable> c (binding_proxy.get_controllable ());
 
-        if (!c) {
-                warning << _("button cannot watch state of non-existing Controllable\n") << endmsg;
-                return;
-        }
-
-        c->Changed.connect (watch_connection, invalidator(*this), boost::bind (&ArdourButton::controllable_changed, this), gui_context());
+	if (!c) {
+		warning << _("button cannot watch state of non-existing Controllable\n") << endmsg;
+		return;
+	}
+	c->Changed.connect (watch_connection, invalidator(*this), boost::bind (&ArdourButton::controllable_changed, this), gui_context());
 }
 
 void
 ArdourButton::controllable_changed ()
 {
-        float val = binding_proxy.get_controllable()->get_value();
+	float val = binding_proxy.get_controllable()->get_value();
 
 	if (fabs (val) >= 0.5f) {
 		set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
 		unset_active_state ();
 	}
+	CairoWidget::set_dirty ();
 }
 
 void
@@ -864,7 +930,8 @@ ArdourButton::action_toggled ()
 void
 ArdourButton::on_style_changed (const RefPtr<Gtk::Style>&)
 {
-	on_name_changed();
+	_update_colors = true;
+	CairoWidget::set_dirty ();
 }
 
 void
@@ -873,9 +940,10 @@ ArdourButton::on_name_changed ()
 	_char_pixel_width = 0;
 	_char_pixel_height = 0;
 	_diameter = 0;
-	set_colors ();
-	build_patterns ();
-	queue_resize ();
+	_update_colors = true;
+	if (is_realized()) {
+		queue_resize ();
+	}
 }
 
 void
@@ -887,18 +955,19 @@ ArdourButton::setup_led_rect ()
 		return;
 	}
 
-	_led_rect = new cairo_rectangle_t;
+	if (!_led_rect) {
+		_led_rect = new cairo_rectangle_t;
+	}
 
 	if (_elements & Text) {
-		int led_xoff = ceil(char_pixel_width() + _diameter * .5);
 		if (_led_left) {
-			_led_rect->x = led_xoff;
+			_led_rect->x = char_pixel_width();
 		} else {
-			_led_rect->x = get_width() - led_xoff;
+			_led_rect->x = get_width() - char_pixel_width() + _diameter;
 		}
 	} else {
 		/* centered */
-		_led_rect->x = .5 * (get_width() - _diameter);
+		_led_rect->x = .5 * get_width() - _diameter;
 	}
 
 	_led_rect->y = .5 * (get_height() - _diameter);
@@ -910,7 +979,9 @@ void
 ArdourButton::set_image (const RefPtr<Gdk::Pixbuf>& img)
 {
 	_pixbuf = img;
-	queue_draw ();
+	if (is_realized()) {
+		queue_resize ();
+	}
 }
 
 void
@@ -919,8 +990,8 @@ ArdourButton::set_active_state (Gtkmm2ext::ActiveState s)
 	bool changed = (_active_state != s);
 	CairoWidget::set_active_state (s);
 	if (changed) {
-		set_colors ();
-		build_patterns ();
+		_update_colors = true;
+		CairoWidget::set_dirty ();
 	}
 }
 
@@ -930,17 +1001,16 @@ ArdourButton::set_visual_state (Gtkmm2ext::VisualState s)
 	bool changed = (_visual_state != s);
 	CairoWidget::set_visual_state (s);
 	if (changed) {
-		set_colors ();
-		build_patterns ();
+		_update_colors = true;
+		CairoWidget::set_dirty ();
 	}
 }
 
-
 bool
 ArdourButton::on_focus_in_event (GdkEventFocus* ev)
 {
 	_focused = true;
-	queue_draw ();
+	CairoWidget::set_dirty ();
 	return CairoWidget::on_focus_in_event (ev);
 }
 
@@ -948,14 +1018,14 @@ bool
 ArdourButton::on_focus_out_event (GdkEventFocus* ev)
 {
 	_focused = false;
-	queue_draw ();
+	CairoWidget::set_dirty ();
 	return CairoWidget::on_focus_out_event (ev);
 }
 
 bool
 ArdourButton::on_key_release_event (GdkEventKey *ev) {
 	if (_focused &&
-			(ev->keyval == GDK_KEY_space || ev->keyval == GDK_Return))
+			(ev->keyval == GDK_space || ev->keyval == GDK_Return))
 	{
 		signal_clicked();
 		if (_action) {
@@ -971,8 +1041,8 @@ ArdourButton::on_enter_notify_event (GdkEventCrossing* ev)
 {
 	_hovering = (_elements & Inactive) ? false : true;
 
-	if (ARDOUR::Config->get_widget_prelight()) {
-		queue_draw ();
+	if (UIConfiguration::instance().get_widget_prelight()) {
+		CairoWidget::set_dirty ();
 	}
 
 	return CairoWidget::on_enter_notify_event (ev);
@@ -983,8 +1053,8 @@ ArdourButton::on_leave_notify_event (GdkEventCrossing* ev)
 {
 	_hovering = false;
 
-	if (ARDOUR::Config->get_widget_prelight()) {
-		queue_draw ();
+	if (UIConfiguration::instance().get_widget_prelight()) {
+		CairoWidget::set_dirty ();
 	}
 
 	return CairoWidget::on_leave_notify_event (ev);
@@ -995,7 +1065,9 @@ ArdourButton::set_tweaks (Tweaks t)
 {
 	if (_tweaks != t) {
 		_tweaks = t;
-		queue_draw ();
+		if (is_realized()) {
+			queue_resize ();
+		}
 	}
 }
 
@@ -1010,27 +1082,75 @@ ArdourButton::action_sensitivity_changed ()
 }
 
 void
-ArdourButton::recalc_char_pixel_geometry ()
+ArdourButton::set_layout_ellipsize_width (int w)
 {
-	if (_char_pixel_height > 0 && _char_pixel_width > 0) {
+	if (_layout_ellipsize_width == w) {
+		return;
+	}
+	_layout_ellipsize_width = w;
+	if (!_layout) {
 		return;
 	}
+	if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+		_layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
+	}
+	if (is_realized ()) {
+		queue_resize ();
+	}
+}
+
+void
+ArdourButton::set_text_ellipsize (Pango::EllipsizeMode e)
+{
+	if (_ellipsis == e) {
+		return;
+	}
+	_ellipsis = e;
+	if (!_layout) {
+		return;
+	}
+	_layout->set_ellipsize(_ellipsis);
+	if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+		_layout->set_width (_layout_ellipsize_width - 3 * PANGO_SCALE);
+	}
+	if (is_realized ()) {
+		queue_resize ();
+	}
+}
+
+void
+ArdourButton::ensure_layout ()
+{
 	if (!_layout) {
+		ensure_style ();
 		_layout = Pango::Layout::create (get_pango_context());
+		_layout->set_ellipsize(_ellipsis);
+		if (_layout_ellipsize_width > 3 * PANGO_SCALE) {
+			_layout->set_width (_layout_ellipsize_width - 3* PANGO_SCALE);
+		}
 	}
+}
+
+void
+ArdourButton::recalc_char_pixel_geometry ()
+{
+	if (_char_pixel_height > 0 && _char_pixel_width > 0) {
+		return;
+	}
+	ensure_layout();
 	// NB. this is not static, since the geometry is different
 	// depending on the font used.
 	int w, h;
-	std::string t = _layout->get_text();
 	std::string x = _("ABCDEFGHIJLKMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
 	_layout->set_text (x);
 	_layout->get_pixel_size (w, h);
-	_layout->set_text (t);
 	_char_pixel_height = std::max(4, h);
 	// number of actual chars in the string (not bytes)
 	// Glib to the rescue.
 	Glib::ustring gx(x);
-	_char_pixel_width = std::max(4, w / (int)gx.size());
+	_char_avg_pixel_width = w / (float)gx.size();
+	_char_pixel_width = std::max(4, (int) ceil (_char_avg_pixel_width));
+	_layout->set_text (_text);
 }
 
 void
@@ -1047,17 +1167,39 @@ void
 ArdourButton::action_tooltip_changed ()
 {
 	string str = _action->property_tooltip().get_value();
-	ARDOUR_UI::instance()->set_tip (*this, str);
+	set_tooltip (*this, str);
 }
 
 void
 ArdourButton::set_elements (Element e)
 {
 	_elements = e;
+	CairoWidget::set_dirty ();
 }
 
 void
 ArdourButton::add_elements (Element e)
 {
 	_elements = (ArdourButton::Element) (_elements | e);
+	CairoWidget::set_dirty ();
+}
+
+void
+ArdourButton::set_icon (Gtkmm2ext::ArdourIcon::Icon i)
+{
+	_icon = i;
+	_elements = (ArdourButton::Element) ((_elements | ArdourButton::VectorIcon) & ~ArdourButton::Text);
+	CairoWidget::set_dirty ();
+}
+
+void
+ArdourButton::set_custom_led_color (uint32_t c, bool useit)
+{
+	if (led_custom_color == c && use_custom_led_color == useit) {
+		return;
+	}
+
+	led_custom_color = c;
+	use_custom_led_color = useit;
+	CairoWidget::set_dirty ();
 }