X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ftext.cc;h=19c4b417f9dc595c74a08d16e5e9959d85cce96e;hb=6f019faaa0c3875040ec608f30b09832daa5bc87;hp=7143f2aca704257547c5a1fe06671af79405b7f9;hpb=e466ce40ad1ba591543020cb7c0aa15dbebef81e;p=ardour.git diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 7143f2aca7..19c4b417f9 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -20,28 +20,45 @@ #include #include +#include #include #include "pbd/stacktrace.h" #include "canvas/text.h" #include "canvas/canvas.h" -#include "canvas/utils.h" +#include "gtkmm2ext/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 () @@ -52,8 +69,12 @@ Text::~Text () void Text::set (string const & text) { + if (text == _text) { + return; + } + begin_change (); - + _text = text; _need_redraw = true; @@ -62,15 +83,58 @@ Text::set (string const & text) end_change (); } -void -Text::redraw (Cairo::RefPtr context) const +double +Text::width () const { - if (_text.empty()) { - return; + if (_need_redraw) { + _redraw (); } + return _width; +} +double +Text::height () const +{ + if (_need_redraw) { + _redraw (); + } + return _height; +} + +void +Text::_redraw () const +{ + assert (!_text.empty()); + assert (_canvas); + Glib::RefPtr context = _canvas->get_pango_context(); Glib::RefPtr layout = Pango::Layout::create (context); +#if 0 // def __APPLE__ // Looks like this is no longer needed 2017-03-11, pango 1.36.8, pangomm 2.34.0 + 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); + + _width_correction = width*1.5; + } +#else + /* don't bother with a conditional here */ + _width_correction = 0.0; +#endif + layout->set_text (_text); if (_font_description) { @@ -78,88 +142,116 @@ Text::redraw (Cairo::RefPtr 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 + _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) { + Gtkmm2ext::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 (); + Gtkmm2ext::set_source_rgba (img_context, _color); + img_context->fill (); + } else { + Gtkmm2ext::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 ())); + Rect 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); + + 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 Text::compute_bounding_box () const { if (!_canvas || _text.empty()) { - _bounding_box = boost::optional (); + _bounding_box = Rect (); _bounding_box_dirty = false; return; } if (_bounding_box_dirty) { - if (!_image) { - - PangoContext* _pc = gdk_pango_context_get (); - Glib::RefPtr context = Glib::wrap (_pc); // context now owns _pc and will free it - Glib::RefPtr 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()); +#ifdef __APPLE__ + const float retina_factor = 0.5; +#else + const float retina_factor = 1.0; +#endif + if (_need_redraw || !_image) { + _redraw (); } - + _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width() * retina_factor), _image->get_height() * retina_factor); _bounding_box_dirty = false; } } @@ -167,8 +259,12 @@ Text::compute_bounding_box () const void Text::set_alignment (Pango::Alignment alignment) { + if (alignment == _alignment) { + return; + } + begin_change (); - + _alignment = alignment; _need_redraw = true; _bounding_box_dirty = true; @@ -179,26 +275,34 @@ 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 (); } void -Text::set_color (Color color) +Text::set_color (Gtkmm2ext::Color color) { + if (color == _color) { + return; + } + begin_change (); _color = color; + if (_outline) { + set_outline_color (Gtkmm2ext::contrasting_text_color (_color)); + } _need_redraw = true; end_change (); } - + void Text::dump (ostream& o) const { @@ -209,3 +313,14 @@ Text::dump (ostream& o) const o << endl; } + + +double +Text::text_width() const +{ + if (_need_redraw) { + redraw (); + } + + return _width; +}