workaround/hack/fix for cairo pattern gradient space exceeding 2^16 size limit

1 files changed, 22 insertions, 20 deletions

diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc
index e33c5d2bc0..8a16f4f794 100644
--- a/libs/canvas/fill.cc
+++ b/libs/canvas/fill.cc
@@ -59,37 +59,39 @@ Fill::set_fill (bool fill)
 void
 Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const
 {
-	if (_gradient) {
-		Cairo::Matrix m;
-
-		Duple origin = item_to_window (Duple (0, 0));
-
-		context->translate (origin.x, origin.y);
-		context->set_source (_gradient);
-		context->translate (-origin.x, -origin.y);
+	set_source_rgba (context, _fill_color);
+}
 
+void
+Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const & self, Duple const & draw_origin) const
+{
+	Cairo::RefPtr<Cairo::LinearGradient> _gradient;
+	
+	if (_vertical_gradient) {
+		_gradient = Cairo::LinearGradient::create (draw_origin.x, self.y0, draw_origin.x, self.y1);
 	} else {
-		set_source_rgba (context, _fill_color);
+		_gradient = Cairo::LinearGradient::create (self.x0, draw_origin.y, self.x1, draw_origin.y);
 	}
+	
+	for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) {
+		double r, g, b, a;
+		color_to_rgba (s->second, r, g, b, a);
+		_gradient->add_color_stop_rgba (s->first, r, g, b, a);
+	}
+	
+	context->set_source (_gradient);
 }
 
 void
-Fill::set_gradient (StopList const & stops, double height)
+Fill::set_gradient (StopList const & stops, bool vertical)
 {
 	begin_visual_change ();
 
 	if (stops.empty()) {
-		_gradient.clear();
+		_stops.clear ();
 	} else {
-
-		double r, g, b, a;
-		
-		_gradient = Cairo::LinearGradient::create (0, 0, 0, height);
-		
-		for (StopList::const_iterator s = stops.begin(); s != stops.end(); ++s) {
-			color_to_rgba (s->second, r, g, b, a);
-			_gradient->add_color_stop_rgba (s->first, r, g, b, a);
-		}
+		_stops = stops;
+		_vertical_gradient = vertical;
 	}
 
 	end_visual_change ();