Standardize drawing of PixFader and BarController; implement flat_buttons and prelight.

Prepare for using Controllable interfaces, instead of passing in Adjustments.
ToDo:  reimplement image caching in a standardized way across widgets

1 files changed, 108 insertions, 214 deletions

diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index ef1dffc1dd..d6b051373b 100644
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -27,6 +27,7 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/rgb_macros.h"
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -37,18 +38,18 @@ using namespace std;
 #define CORNER_OFFSET 1
 #define FADER_RESERVE 5
 
-std::list<PixFader::FaderImage*> PixFader::_patterns;
-
 PixFader::PixFader (Gtk::Adjustment& adj, int orientation, int fader_length, int fader_girth)
 	: adjustment (adj)
 	, span (fader_length)
 	, girth (fader_girth)
 	, _orien (orientation)
-	, pattern (0)
 	, _hovering (false)
 	, last_drawn (-1)
 	, dragging (false)
 {
+	bg_gradient = 0;
+	fg_gradient = 0;
+
 	default_value = adjustment.get_value();
 	update_unity_position ();
 
@@ -68,239 +69,149 @@ PixFader::~PixFader ()
 {
 }
 
-cairo_pattern_t*
-PixFader::find_pattern (double afr, double afg, double afb, 
-			double abr, double abg, double abb, 
-			int w, int h)
-{
-	for (list<FaderImage*>::iterator f = _patterns.begin(); f != _patterns.end(); ++f) {
-		if ((*f)->matches (afr, afg, afb, abr, abg, abb, w, h)) {
-			return (*f)->pattern;
-		}
-	}
-	return 0;
-}
-
-void
-PixFader::create_patterns ()
-{
-	Gdk::Color c = get_style()->get_fg (get_state());
-	float fr, fg, fb;
-	float br, bg, bb;
-
-	fr = c.get_red_p ();
-	fg = c.get_green_p ();
-	fb = c.get_blue_p ();
-
-	c = get_style()->get_bg (get_state());
-
-	br = c.get_red_p ();
-	bg = c.get_green_p ();
-	bb = c.get_blue_p ();
-
-	if ( !_text.empty()) {
-		_layout->get_pixel_size (_text_width, _text_height);
-	} else {
-		_text_width = 0;
-		_text_height = 0;
-	}
-
-	c = get_style()->get_text (get_state());
-
-	text_r = c.get_red_p ();
-	text_g = c.get_green_p ();
-	text_b = c.get_blue_p ();
-
-	cairo_surface_t* surface;
-	cairo_t* tc = 0;
-
-	if (get_width() <= 1 || get_height() <= 1) {
-		return;
-	}
-
-	if ((pattern = find_pattern (fr, fg, fb, br, bg, bb, get_width(), get_height())) != 0) {
-		/* found it - use it */
-		return;
-	}
-
- 	if (_orien == VERT) {
-		
-		surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, get_width(), get_height() * 2.0);
-		tc = cairo_create (surface);
-
-		/* paint background + border */
-
-		cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, get_width(), 0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.8,bg*0.8,bb*0.8, 1.0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.6,bg*0.6,bb*0.6, 1.0);
-		cairo_set_source (tc, shade_pattern);
-		cairo_rectangle (tc, 0, 0, get_width(), get_height() * 2.0);
-		cairo_fill (tc);
-
-		cairo_pattern_destroy (shade_pattern);
-		
-		/* paint lower shade */
-		
-		shade_pattern = cairo_pattern_create_linear (0.0, 0.0, get_width() - 2 - CORNER_OFFSET , 0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 0, fr*0.8,fg*0.8,fb*0.8, 1.0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 1, fr*0.6,fg*0.6,fb*0.6, 1.0);
-		cairo_set_source (tc, shade_pattern);
-		Gtkmm2ext::rounded_top_half_rectangle (tc, CORNER_OFFSET, get_height() + CORNER_OFFSET,
-				get_width() - CORNER_SIZE, get_height(), CORNER_RADIUS);
-		cairo_fill (tc);
-
-		cairo_pattern_destroy (shade_pattern);
-
-		pattern = cairo_pattern_create_for_surface (surface);
-
-	} else {
-
-		surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, get_width() * 2.0, get_height());
-		tc = cairo_create (surface);
-
-		/* paint right shade (background section)*/
-
-		cairo_pattern_t* shade_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 0, br*0.8,bg*0.8,bb*0.8, 1.0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 1, br*0.6,bg*0.6,bb*0.6, 1.0);
-		cairo_set_source (tc, shade_pattern);
-		cairo_rectangle (tc, 0, 0, get_width() * 2.0, get_height());
-		cairo_fill (tc);
-
-		/* paint left shade (active section/foreground) */
-		
-		shade_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, get_height());
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 0, fr*0.8,fg*0.8,fb*0.8, 1.0);
-		cairo_pattern_add_color_stop_rgba (shade_pattern, 1, fr*0.6,fg*0.6,fb*0.6, 1.0);
-		cairo_set_source (tc, shade_pattern);
-		Gtkmm2ext::rounded_right_half_rectangle (tc, CORNER_OFFSET, CORNER_OFFSET,
-				get_width() - CORNER_OFFSET, get_height() - CORNER_SIZE, CORNER_RADIUS);
-		cairo_fill (tc);
-		cairo_pattern_destroy (shade_pattern);
-		
-		pattern = cairo_pattern_create_for_surface (surface);
-	}
-
-	/* cache it for others to use */
-
-	_patterns.push_back (new FaderImage (pattern, fr, fg, fb, br, bg, bb, get_width(), get_height()));
-
-	cairo_destroy (tc);
-	cairo_surface_destroy (surface);
-}
-
 bool
 PixFader::on_expose_event (GdkEventExpose* ev)
 {
 	Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
 	cairo_t* cr = context->cobj();
 
-	if (!pattern) {
-		create_patterns();
-	}
-
-	if (!pattern) {
+	Gdk::Color fg_col = get_style()->get_fg (get_state());
 
-		/* this isn't supposed to be happen, but some wackiness whereby
-		   the pixfader ends up with a 1xN or Nx1 size allocation
-		   leads to it. the basic wackiness needs fixing but we
-		   shouldn't crash. just fill in the expose area with 
-		   our bg color.
-		*/
-
-		Gdk::Color c = get_style()->get_bg (get_state());
-		float br, bg, bb;
-
-		br = c.get_red_p ();
-		bg = c.get_green_p ();
-		bb = c.get_blue_p ();
-		cairo_set_source_rgb (cr, br, bg, bb);
-		cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-		cairo_fill (cr);
-		return true;
-	}
-		   
-	cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-	cairo_clip (cr);
-
-	int ds = display_span ();
+	float ds = display_span ();
 	float w = get_width();
 	float h = get_height();
 
-	Gdk::Color c = get_style()->get_bg (Gtk::STATE_PRELIGHT);
-	cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+	//fill in the bg rect ... 
+	Gdk::Color c = get_style()->get_bg (Gtk::STATE_PRELIGHT);  //why prelight?  Shouldn't we be using the parent's color?
+	CairoWidget::set_source_rgb_a (cr, c);
 	cairo_rectangle (cr, 0, 0, w, h);
 	cairo_fill(cr);
 
-	cairo_set_line_width (cr, 1);
-	cairo_set_source_rgba (cr, 0, 0, 0, 1.0);
-
-	cairo_matrix_t matrix;
-	Gtkmm2ext::rounded_rectangle (cr, CORNER_OFFSET, CORNER_OFFSET, w-CORNER_SIZE, h-CORNER_SIZE, CORNER_RADIUS);
-	cairo_stroke_preserve(cr);
+	//"slot"
+	cairo_set_source_rgba (cr, 0.17, 0.17, 0.17, 1.0);
+	Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, CORNER_RADIUS-0.5);
+	cairo_fill(cr);
 
+	//mask off the corners
+	Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, CORNER_RADIUS-0.5);
+	cairo_clip(cr);
+	
 	if (_orien == VERT) {
 
-		if (ds > h - FADER_RESERVE - CORNER_OFFSET) {
-			ds = h - FADER_RESERVE - CORNER_OFFSET;
+		int travel = h - 1;
+		int progress = travel * (1.0-ds);
+		int top = 1 + progress;
+		int bottom = h;
+		
+		//background gradient
+		if ( !CairoWidget::flat_buttons() ) {
+			cairo_pattern_t *bg_gradient = cairo_pattern_create_linear (0.0, 0.0, w, 0);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 0, 0, 0, 0, 0.4);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 0.2, 0, 0, 0, 0.2);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 1, 0, 0, 0, 0.0);
+			cairo_set_source (cr, bg_gradient);
+			Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, CORNER_RADIUS-1.5);
+			cairo_fill (cr);
+			cairo_pattern_destroy(bg_gradient);
+		}
+		
+		//fg color
+		CairoWidget::set_source_rgb_a (cr, fg_col, 1.0);
+		Gtkmm2ext::rounded_top_rectangle (cr, 1, top, w-2, bottom, CORNER_RADIUS - 1.5);
+		cairo_fill(cr);
+
+		//fg gradient
+		if (!CairoWidget::flat_buttons() ) {
+			cairo_pattern_t *fg_gradient = cairo_pattern_create_linear (0.0, 0.0, w, 0);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 0, 0, 0, 0, 0.0);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 0.1, 0, 0, 0, 0.0);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 1, 0, 0, 0, 0.3);
+			cairo_set_source (cr, fg_gradient);
+			Gtkmm2ext::rounded_rectangle (cr, 1, top, w-2, bottom, CORNER_RADIUS - 1.5);
+			cairo_fill (cr);
+			cairo_pattern_destroy(fg_gradient);
 		}
-
-		cairo_set_source (cr, pattern);
-		cairo_matrix_init_translate (&matrix, 0, (h - ds));
-		cairo_pattern_set_matrix (pattern, &matrix);
-		cairo_fill (cr);
-
 	} else {
 
-		if (ds < FADER_RESERVE) {
-			ds = FADER_RESERVE;
+		int travel = w - 1;
+		int progress = travel * ds;
+		int left = 1;
+		int length = progress;
+		
+		//background gradient
+		if ( !CairoWidget::flat_buttons() ) {
+			cairo_pattern_t *bg_gradient = cairo_pattern_create_linear (0.0, 0.0, 0, h);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 0, 0, 0, 0, 0.4);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 0.2, 0, 0, 0, 0.2);
+			cairo_pattern_add_color_stop_rgba (bg_gradient, 1, 0, 0, 0, 0.0);
+			cairo_set_source (cr, bg_gradient);
+			Gtkmm2ext::rounded_rectangle (cr, 1, 1, w-2, h-2, CORNER_RADIUS-1.5);
+			cairo_fill (cr);
+			cairo_pattern_destroy(bg_gradient);
+		}
+		
+		//fg color
+		CairoWidget::set_source_rgb_a (cr, fg_col, 1.0);
+		Gtkmm2ext::rounded_rectangle (cr, left, 1, length, h-2, CORNER_RADIUS - 1.5);
+		cairo_fill(cr);
+
+		//fg gradient
+		if (!CairoWidget::flat_buttons() ) {
+			cairo_pattern_t * fg_gradient = cairo_pattern_create_linear (0.0, 0.0, 0, h);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 0, 0, 0, 0, 0.0);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 0.1, 0, 0, 0, 0.0);
+			cairo_pattern_add_color_stop_rgba (fg_gradient, 1, 0, 0, 0, 0.3);
+			cairo_set_source (cr, fg_gradient);
+		Gtkmm2ext::rounded_rectangle (cr, left, 1, length, h-2, CORNER_RADIUS - 1.5);
+			cairo_fill (cr);
+			cairo_pattern_destroy(fg_gradient);
 		}
-
-		/*
-		  if ds == w, the pattern does not need to be translated
-		  if ds == 0 (or FADER_RESERVE), the pattern needs to be moved
-   		      w to the left, which is -w in pattern space, and w in
-		      user space
-		  if ds == 10, then the pattern needs to be moved w - 10
-		      to the left, which is -(w-10) in pattern space, which 
-		      is (w - 10) in user space
-
-		  thus: translation = (w - ds)
-		 */
-
-		cairo_set_source (cr, pattern);
-		cairo_matrix_init_translate (&matrix, w - ds, 0);
-		cairo_pattern_set_matrix (pattern, &matrix);
-		cairo_fill (cr);
 	}
 		
+	cairo_reset_clip(cr);
+
+	//black border
+	cairo_set_line_width (cr, 1.0);
+	cairo_set_source_rgba (cr, 0, 0, 0, 1.0);
+	Gtkmm2ext::rounded_rectangle (cr, 0.5, 0.5, w-1, h-1, CORNER_RADIUS);
+	cairo_stroke(cr);
+
 	/* draw the unity-position line if it's not at either end*/
 	if (unity_loc > 0) {
 		context->set_line_width (1);
-		context->set_line_cap (Cairo::LINE_CAP_ROUND);
 		Gdk::Color c = get_style()->get_fg (Gtk::STATE_ACTIVE);
-		context->set_source_rgba (c.get_red_p()*1.5, c.get_green_p()*1.5, c.get_blue_p()*1.5, 0.85);
+		CairoWidget::set_source_rgb_a (cr, c, 1.0);
 		if ( _orien == VERT) {
 			if (unity_loc < h ) {
-				context->move_to (1.5, unity_loc + CORNER_OFFSET + .5);
-				context->line_to (girth - 1.5, unity_loc + CORNER_OFFSET + .5);
+				context->move_to (2.5, unity_loc + CORNER_OFFSET + .5);
+				context->line_to (girth-2.5, unity_loc + CORNER_OFFSET + .5);
 				context->stroke ();
 			}
 		} else {
 			if ( unity_loc < w ){
-				context->move_to (unity_loc - CORNER_OFFSET + .5, 1.5);
-				context->line_to (unity_loc - CORNER_OFFSET + .5, girth - 1.5);
+				context->move_to (unity_loc - CORNER_OFFSET + .5, 3.5);
+				context->line_to (unity_loc - CORNER_OFFSET + .5, girth-3.5);
 				context->stroke ();
 			}
 		}
 	}
-
+	
+	//draw text
 	if ( !_text.empty() ) {
 
+		//calc text size
+		if ( !_text.empty()) {
+			_layout->get_pixel_size (_text_width, _text_height);
+		} else {
+			_text_width = 0;
+			_text_height = 0;
+		}
+
 		/* center text */
 		cairo_new_path (cr);
 		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, 0.9);
+		Gdk::Color c = get_style()->get_text (get_state());
+		CairoWidget::set_source_rgb_a (cr, c, 0.9);
 		pango_cairo_show_layout (cr, _layout->gobj());
 	} 
 	
@@ -344,11 +255,6 @@ PixFader::on_size_allocate (Gtk::Allocation& alloc)
 		span = alloc.get_width ();
 	}
 
-	if (is_realized()) {
-		/* recreate patterns in case we've changed size */
-		create_patterns ();
-	}
-
 	update_unity_position ();
 }
 
@@ -540,18 +446,12 @@ PixFader::adjustment_changed ()
 }
 
 /** @return pixel offset of the current value from the right or bottom of the fader */
-int
+float
 PixFader::display_span ()
 {
 	float fract = (adjustment.get_value () - adjustment.get_lower()) / ((adjustment.get_upper() - adjustment.get_lower()));
-	int ds;
-	if (_orien == VERT) {
-		ds = (int)floor ( span * (1.0 - fract));
-	} else {
-		ds = (int)floor (span * fract);
-	}
 	
-	return ds;
+	return fract;
 }
 
 void
@@ -625,7 +525,6 @@ void
 PixFader::on_state_changed (Gtk::StateType old_state)
 {
 	Widget::on_state_changed (old_state);
-	create_patterns ();
 	queue_draw ();
 }
 
@@ -638,10 +537,5 @@ PixFader::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
 		set_text (txt);
 	}
 
-	/* remember that all patterns are cached and not owned by an individual
-	   pixfader. we will lazily create a new pattern when needed.
-	*/
-
-	pattern = 0;
 	queue_draw ();
 }