X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ftext.cc;h=d1f76eb1a3ff84c6566dafabd913874faa148fd1;hb=065d7c852a1586a3020affd6905f108abf252119;hp=438413080a2d7a539283bf157980e5f0d15f126a;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 438413080a..d1f76eb1a3 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "pbd/stacktrace.h" @@ -27,21 +28,38 @@ #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) , _width (0) , _height (0) , _need_redraw (false) + , _width_correction (-1) , _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) + , _width_correction (-1) + , _clamped_width (COORD_MAX) +{ + _outline = false; } Text::~Text () @@ -53,7 +71,7 @@ void Text::set (string const & text) { begin_change (); - + _text = text; _need_redraw = true; @@ -63,31 +81,38 @@ Text::set (string const & text) } void -Text::redraw (Cairo::RefPtr context) const +Text::_redraw () const { - if (_text.empty()) { - return; - } - + assert (!_text.empty()); + Glib::RefPtr context = Glib::wrap (gdk_pango_context_get()); Glib::RefPtr layout = Pango::Layout::create (context); - _redraw (layout); -} +#ifdef __APPLE__ + if (_width_correction < 0.0) { + // Pango returns incorrect text width on some OS X + // So we have to make a correction + // To determine the correct indent take the largest symbol for which the width is correct + // and make the calculation + Gtk::Window win; + Gtk::Label foo; + win.add (foo); + win.ensure_style (); + + int width = 0; + int height = 0; + Glib::RefPtr test_layout = foo.create_pango_layout ("H"); + if (_font_description) { + test_layout->set_font_description (*_font_description); + } + test_layout->get_pixel_size (width, height); -void -Text::redraw (Glib::RefPtr context) const -{ - if (_text.empty()) { - return; + _width_correction = width*1.5; } +#else + /* don't bother with a conditional here */ + _width_correction = 0.0; +#endif - Glib::RefPtr layout = Pango::Layout::create (context); - _redraw (layout); -} - -void -Text::_redraw (Glib::RefPtr layout) const -{ layout->set_text (_text); if (_font_description) { @@ -95,54 +120,95 @@ Text::_redraw (Glib::RefPtr layout) const } layout->set_alignment (_alignment); - + int w; int h; - layout->get_size (w, h); - - _width = w / Pango::SCALE; - _height = h / Pango::SCALE; - + layout->get_pixel_size (w, h); + + _width = w + _width_correction; + _height = h; + +#ifdef __APPLE__ + _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width * 2, _height * 2); +#else _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width, _height); +#endif Cairo::RefPtr img_context = Cairo::Context::create (_image); - /* and draw, in the appropriate color of course */ +#ifdef __APPLE__ + /* Below, the rendering scaling is set to support retina display + */ + img_context->scale (2, 2); +#endif - set_source_rgba (img_context, _color); + /* and draw, in the appropriate color of course */ - 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 + * ::render */ _need_redraw = false; } void -Text::render (Rect const & /*area*/, Cairo::RefPtr context) const +Text::render (Rect const & area, Cairo::RefPtr 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 i = self.intersection (area); + + if (!i) { + return; + } + if (_need_redraw) { - redraw (context); + _redraw (); } - - 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()); +#ifdef __APPLE__ + /* Below, the rendering scaling is set to support retina display + */ + Cairo::Matrix original_matrix = context->get_matrix(); + context->scale (0.5, 0.5); + context->set_source (_image, self.x0 * 2, self.y0 * 2); + context->fill (); + context->set_matrix (original_matrix); +#else context->set_source (_image, self.x0, self.y0); context->fill (); +#endif } void Text::clamp_width (double w) { + if (_clamped_width == w) { + return; + } + begin_change (); _clamped_width = w; + _bounding_box_dirty = true; + end_change (); } void @@ -155,11 +221,15 @@ Text::compute_bounding_box () const } if (_bounding_box_dirty) { +#ifdef __APPLE__ + const float retina_factor = 0.5; +#else + const float retina_factor = 1.0; +#endif if (_need_redraw || !_image) { - Glib::RefPtr context = Glib::wrap (gdk_pango_context_get()); // context now owns C object and will free it - redraw (context); + _redraw (); } - _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width()), _image->get_height()); + _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width() * retina_factor), _image->get_height() * retina_factor); _bounding_box_dirty = false; } } @@ -168,7 +238,7 @@ void Text::set_alignment (Pango::Alignment alignment) { begin_change (); - + _alignment = alignment; _need_redraw = true; _bounding_box_dirty = true; @@ -179,9 +249,10 @@ void Text::set_font_description (Pango::FontDescription font_description) { begin_change (); - + _font_description = new Pango::FontDescription (font_description); _need_redraw = true; + _width_correction = -1.0; _bounding_box_dirty = true; end_change (); @@ -193,12 +264,15 @@ Text::set_color (Color color) begin_change (); _color = color; + if (_outline) { + set_outline_color (contrasting_text_color (_color)); + } _need_redraw = true; end_change (); } - + void Text::dump (ostream& o) const { @@ -209,3 +283,14 @@ Text::dump (ostream& o) const o << endl; } + + +double +Text::text_width() const +{ + if (_need_redraw) { + redraw (); + } + + return _width; +}