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

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 3e97099703..a9eabd33d9 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -38,6 +38,8 @@
 
 #include "i18n.h"
 
+#define REFLECTION_HEIGHT 2
+
 using namespace Gdk;
 using namespace Gtk;
 using namespace Glib;
@@ -57,11 +59,14 @@ ArdourButton::ArdourButton (Element e)
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (11.0)
-	, _corner_radius (5.0)
+	, _corner_radius (4.0)
 	, _corner_mask (0xf)
-	, edge_pattern (0)
-	, active_pattern (0)
-	, inactive_pattern (0)
+	, 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)
@@ -80,11 +85,14 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
 	, _text_width (0)
 	, _text_height (0)
 	, _diameter (11.0)
-	, _corner_radius (9.0)
+	, _corner_radius (4.0)
 	, _corner_mask (0xf)
-	, edge_pattern (0)
-	, active_pattern (0)
-	, inactive_pattern (0)
+	, 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)
@@ -101,17 +109,26 @@ ArdourButton::~ArdourButton()
 {
 	delete _led_rect;
 
-	if (edge_pattern) {
-		cairo_pattern_destroy (edge_pattern);
+	if (shine_pattern) {
+		cairo_pattern_destroy (shine_pattern);
 	}
 
-	if (active_pattern) {
-		cairo_pattern_destroy (active_pattern);
+	if (fill_pattern) {
+		cairo_pattern_destroy (fill_pattern);
 	}
-
-	if (inactive_pattern) {
-		cairo_pattern_destroy (inactive_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
@@ -169,31 +186,78 @@ ArdourButton::render (cairo_t* cr)
 		_diameter = std::min (get_width(), get_height());
 	}
 
-	if (_elements & Edge) {
-		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
-		cairo_set_source (cr, edge_pattern);
-		cairo_fill (cr);
-	}
+	float r,g,b,a;
 
-	if (_elements & Body) {
+	if ((_elements & Body)==Body) {
 		if (_elements & Edge) {
-			rounded_function (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius - 1.0);
+
+			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 - 1.0);
+			rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
 		}
 
 		if (active_state() == Gtkmm2ext::ImplicitActive) {
-			cairo_set_source (cr, inactive_pattern);
-			cairo_fill_preserve (cr);
+			
+			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 & 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);
-			cairo_set_source (cr, active_pattern);
-			cairo_stroke (cr);
-		} else if (active_state() == Gtkmm2ext::ExplicitActive) {
-			cairo_set_source (cr, active_pattern);
+			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 {
-			cairo_set_source (cr, inactive_pattern);
+
+			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);
+
 		}
 	}
 
@@ -213,12 +277,12 @@ ArdourButton::render (cairo_t* cr)
 	int text_margin;
 
 	if (get_width() < 75) {
-		text_margin = 3;
+		text_margin = 5;
 	} else {
 		text_margin = 10;
 	}
 
-	if ((_elements & Text) && !_text.empty()) {
+	if ( ((_elements & Text)==Text) && !_text.empty()) {
 
 		cairo_new_path (cr);	
 
@@ -237,7 +301,7 @@ ArdourButton::render (cairo_t* cr)
 		pango_cairo_show_layout (cr, _layout->gobj());
 	} 
 
-	if (_elements & Indicator) {
+	if (((_elements & Indicator)==Indicator)) {
 
 		/* move to the center of the indicator/led */
 
@@ -268,14 +332,7 @@ 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);
-
 	}
 
 
@@ -283,7 +340,18 @@ ArdourButton::render (cairo_t* cr)
 
 	if ((visual_state() & Gtkmm2ext::Insensitive)) {
 		rounded_function (cr, 0, 0, get_width(), get_height(), _corner_radius);
-		cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.5);
+		cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.5);
+		cairo_fill (cr);
+	}
+
+	//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);
 	}
 
@@ -369,58 +437,37 @@ 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);
-		edge_pattern = 0;
+	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, get_height());
-		if (visual_state() & Gtkmm2ext::Selected) {
-			start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name()));
-			if (_flat_buttons) {
-				end_color = start_color;
-			} else {
-				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()));
-			if (_flat_buttons) {
-				end_color = start_color;
-			} else {
-				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;
 	}
 
-	if (active_pattern) {
-		cairo_pattern_destroy (active_pattern);
-		active_pattern = 0;
+	if (fill_pattern) {
+		cairo_pattern_destroy (fill_pattern);
+		fill_pattern = 0;
 	}
 
-	if (inactive_pattern) {
-		cairo_pattern_destroy (inactive_pattern);
-		inactive_pattern = 0;
+	if (fill_pattern_active) {
+		cairo_pattern_destroy (fill_pattern_active);
+		fill_pattern_active = 0;
 	}
 
 	if (_elements & Body) {
 
-		active_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
 		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
-
+		
 		if (_flat_buttons) {
 			end_color = start_color;
 		} else {
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
+			end_color = fill_color_active;
 		}
 		UINT_TO_RGBA (start_color, &r, &g, &b, &a);
 
@@ -429,21 +476,44 @@ ArdourButton::set_colors ()
 		active_b = b/255.0;
 		active_a = a/255.0;
 
-		cairo_pattern_add_color_stop_rgba (active_pattern, 0, r/255.0,g/255.0,b/255.0, 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 = 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 (active_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+		cairo_pattern_add_color_stop_rgba (fill_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
 
-		inactive_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
-		start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
+		fill_pattern_active = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height()-3);
 		if (_flat_buttons) {
-			end_color = start_color;
+			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 {
-			end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
+			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 (inactive_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
+		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 (inactive_pattern, 1, r/255.0,g/255.0,b/255.0, a/255.0);
+		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) {
@@ -466,7 +536,7 @@ ArdourButton::set_colors ()
 	
 	/* text and LED colors */
 
-	if (active_state() == Gtkmm2ext::ExplicitActive) {
+	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 {
@@ -783,6 +853,13 @@ ArdourButton::set_elements (Element e)
 	set_colors ();
 }
 
+void
+ArdourButton::add_elements (Element e)
+{
+	_elements = (ArdourButton::Element) (_elements | e);
+	set_colors ();
+}
+
 void
 ArdourButton::set_flat_buttons (bool yn)
 {