fix rect redraw problems caused by intersection requiring the usual 0.5 expansion (though consider a more general fix for this at teh group level)

1 files changed, 17 insertions, 22 deletions

diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index e4575de3b5..4c4d16d85c 100644
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -96,12 +96,27 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 	 * ::render 
 	 */
 
-	cerr << "rendered \"" << layout->get_text() << "\" into image\n";
-
 	_need_redraw = false;
 }
 
 void
+Text::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
+{
+	if (_text.empty()) {
+		return;
+	}
+
+	if (_need_redraw) {
+		redraw (context);
+	}
+	
+	Rect self = item_to_window (Rect (0, 0, min (_clamped_width, _width), _height));
+	context->rectangle (self.x0, self.y0, self.width(), self.height());
+	context->set_source (_image, self.x0, self.y0);
+	context->fill ();
+}
+
+void
 Text::clamp_width (double w)
 {
 	_clamped_width = w;
@@ -138,26 +153,6 @@ Text::compute_bounding_box () const
 }
 
 void
-Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
-{
-	if (_text.empty()) {
-		return;
-	}
-
-	if (_need_redraw) {
-		redraw (context);
-	}
-	
-	
-	Rect self = item_to_window (Rect (0, 0, min (_clamped_width, _width), _height));
-	cerr << "Draw \"" << _text << "\" @ " << self.x0 << ", " << self.y0 << ' ' << self.width() << " x " << self.height() << endl;
-	context->rectangle (self.x0, self.y0, self.width(), self.height());
-	context->set_source (_image, 0, 0);
-	//context->set_source_rgb (0.3, 0.4, 0.02);
-	context->fill ();
-}
-
-void
 Text::set_alignment (Pango::Alignment alignment)
 {
 	begin_change ();