fix merge errors with master

[ardour.git] / libs / canvas / text.cc

diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index c0bac2f7ee08403582fafcab8eb21286bbfd8e60..438413080a2d7a539283bf157980e5f0d15f126a 100644 (file)
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -65,8 +65,29 @@ Text::set (string const & text)
 void
 Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 {
+       if (_text.empty()) {
+               return;
+       }
+
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
 
+       _redraw (layout);
+}
+
+void
+Text::redraw (Glib::RefPtr<Pango::Context> context) const
+{
+       if (_text.empty()) {
+               return;
+       }
+
+       Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
+       _redraw (layout);
+}
+
+void
+Text::_redraw (Glib::RefPtr<Pango::Layout> layout) const
+{
        layout->set_text (_text);
 
        if (_font_description) {
@@ -75,13 +96,13 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 
        layout->set_alignment (_alignment);
        
-       Pango::Rectangle ink_rect = layout->get_ink_extents();
-       
-       _origin.x = ink_rect.get_x() / Pango::SCALE;
-       _origin.y = ink_rect.get_y() / Pango::SCALE;
+       int w;
+       int h;
 
-       _width = _origin.x + (ink_rect.get_width() / Pango::SCALE);
-       _height = _origin.y + (ink_rect.get_height() / Pango::SCALE);
+       layout->get_size (w, h);
+       
+       _width = w / Pango::SCALE;
+       _height = h / Pango::SCALE;
        
        _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width, _height);
 
@@ -90,6 +111,7 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
        /* and draw, in the appropriate color of course */
 
        set_source_rgba (img_context, _color);
+
        layout->show_in_cairo_context (img_context);
 
        /* text has now been rendered in _image and is ready for blit in
@@ -99,6 +121,24 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
        _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)
 {
@@ -114,41 +154,14 @@ Text::compute_bounding_box () const
                return;
        }
 
-       PangoContext* _pc = gdk_pango_context_get ();
-       Glib::RefPtr<Pango::Context> context = Glib::wrap (_pc); // context now owns _pc and will free it
-       Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
-       
-       layout->set_text (_text);
-       if (_font_description) {
-               layout->set_font_description (*_font_description);
-       }
-       layout->set_alignment (_alignment);
-       Pango::Rectangle const r = layout->get_ink_extents ();
-       
-       _bounding_box = Rect (
-               r.get_x() / Pango::SCALE,
-               r.get_y() / Pango::SCALE,
-               (r.get_x() + r.get_width()) / Pango::SCALE,
-               (r.get_y() + r.get_height()) / Pango::SCALE
-               );
-               
-       _bounding_box_dirty = false;
-}
-
-void
-Text::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
-{
-       if (_text.empty()) {
-               return;
-       }
-
-       if (_need_redraw) {
-               redraw (context);
+       if (_bounding_box_dirty) {
+               if (_need_redraw || !_image) {
+                       Glib::RefPtr<Pango::Context> context = Glib::wrap (gdk_pango_context_get()); // context now owns C object and will free it
+                       redraw (context);
+               }
+               _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width()), _image->get_height());
+               _bounding_box_dirty = false;
        }
-       
-       context->set_source (_image, 0, 0);
-       context->rectangle (0, 0, min (_clamped_width, _width), _height);
-       context->fill ();
 }
 
 void