Canvas::Rect::contains() should treat its right/left coordinates as exclusive

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

diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index 7143f2aca704257547c5a1fe06671af79405b7f9..8744a7fd77d973b545a72abfc5d7bbdc740efefb 100644 (file)
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -27,12 +27,13 @@
 #include "canvas/text.h"
 #include "canvas/canvas.h"
 #include "canvas/utils.h"
+#include "canvas/colors.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
-Text::Text (Group* parent)
-       : Item (parent)
+Text::Text (Canvas* c)
+       : Item (c)
        , _color (0x000000ff)
        , _font_description (0)
        , _alignment (Pango::ALIGN_LEFT)
@@ -41,7 +42,20 @@ Text::Text (Group* parent)
        , _need_redraw (false)
        , _clamped_width (COORD_MAX)
 {
+       _outline = false;
+}
 
+Text::Text (Item* parent)
+       : Item (parent)
+       , _color (0x000000ff)
+       , _font_description (0)
+       , _alignment (Pango::ALIGN_LEFT)
+       , _width (0)
+       , _height (0)
+       , _need_redraw (false)
+       , _clamped_width (COORD_MAX)
+{
+       _outline = false;
 }
 
 Text::~Text ()
@@ -71,6 +85,23 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 
        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) {
@@ -78,24 +109,32 @@ 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;
 
-       _width = _origin.x + (ink_rect.get_width() / Pango::SCALE);
-       _height = _origin.y + (ink_rect.get_height() / Pango::SCALE);
-       
+       int w;
+       int h;
+
+       layout->get_pixel_size (w, h);
+
+       _width = w;
+       _height = h;
+
        _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width, _height);
 
        Cairo::RefPtr<Cairo::Context> img_context = Cairo::Context::create (_image);
 
        /* and draw, in the appropriate color of course */
 
-       set_source_rgba (img_context, _color);
-
-       layout->show_in_cairo_context (img_context);
+       if (_outline) {
+               set_source_rgba (img_context, _outline_color);
+               layout->update_from_cairo_context (img_context);
+               pango_cairo_layout_path (img_context->cobj(), layout->gobj());
+               img_context->stroke_preserve ();
+               set_source_rgba (img_context, _color);
+               img_context->fill ();
+       } else {
+               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
         * ::render 
@@ -105,18 +144,26 @@ Text::redraw (Cairo::RefPtr<Cairo::Context> context) const
 }
 
 void
-Text::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
+Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
        if (_text.empty()) {
                return;
        }
 
+       Rect self = item_to_window (Rect (0, 0, min (_clamped_width, (double)_image->get_width ()), _image->get_height ()));
+       boost::optional<Rect> i = self.intersection (area);
+       
+       if (!i) {
+               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());
+       Rect intersection (i.get());
+
+       context->rectangle (intersection.x0, intersection.y0, intersection.width(), intersection.height());
        context->set_source (_image, self.x0, self.y0);
        context->fill ();
 }
@@ -124,7 +171,10 @@ Text::render (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) cons
 void
 Text::clamp_width (double w)
 {
+        begin_change ();
        _clamped_width = w;
+        _bounding_box_dirty = true;
+        end_change ();
 }
 
 void
@@ -137,29 +187,11 @@ Text::compute_bounding_box () const
        }
 
        if (_bounding_box_dirty) {
-               if (!_image) {
-
-                       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 (
-                               0, 0, 
-                               (r.get_x() + r.get_width()) / Pango::SCALE,
-                               (r.get_y() + r.get_height()) / Pango::SCALE
-                               );
-               } else {
-
-                       _bounding_box = Rect (0, 0, _image->get_width(), _image->get_height());
+               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;
        }
 }
@@ -193,6 +225,9 @@ Text::set_color (Color color)
        begin_change ();
 
        _color = color;
+       if (_outline) {
+               set_outline_color (contrasting_text_color (_color));
+       }
        _need_redraw = true;
 
        end_change ();