X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ftext.cc;h=f17df466151db50b94e0e94308dd37a2fdc60369;hb=eb5161b6012a73eae0a288d71727edcfd161d16a;hp=6fa1d30d31872dd7dae112b8b4f5b3a6734d7534;hpb=5974f4730bbf9335c532017ba842f36e052386bf;p=ardour.git diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 6fa1d30d31..f17df46615 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include "pbd/stacktrace.h" @@ -27,10 +28,12 @@ #include "canvas/text.h" #include "canvas/canvas.h" #include "canvas/utils.h" +#include "canvas/colors.h" using namespace std; using namespace ArdourCanvas; + Text::Text (Canvas* c) : Item (c) , _color (0x000000ff) @@ -39,6 +42,7 @@ Text::Text (Canvas* c) , _width (0) , _height (0) , _need_redraw (false) + , _width_correction (-1) , _clamped_width (COORD_MAX) { _outline = false; @@ -52,6 +56,7 @@ Text::Text (Item* parent) , _width (0) , _height (0) , _need_redraw (false) + , _width_correction (-1) , _clamped_width (COORD_MAX) { _outline = false; @@ -65,8 +70,12 @@ Text::~Text () void Text::set (string const & text) { + if (text == _text) { + return; + } + begin_change (); - + _text = text; _need_redraw = true; @@ -75,32 +84,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 (); } - - Glib::RefPtr layout = Pango::Layout::create (context); - - _redraw (layout); + return _width; } -void -Text::redraw (Glib::RefPtr context) const +double +Text::height () const { - if (_text.empty()) { - return; + if (_need_redraw) { + _redraw (); } - - Glib::RefPtr layout = Pango::Layout::create (context); - _redraw (layout); + return _height; } void -Text::_redraw (Glib::RefPtr layout) const +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) { @@ -114,13 +149,23 @@ Text::_redraw (Glib::RefPtr layout) const layout->get_pixel_size (w, h); - _width = w; + _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); +#ifdef __APPLE__ + /* Below, the rendering scaling is set to support retina display + */ + img_context->scale (2, 2); +#endif + /* and draw, in the appropriate color of course */ if (_outline) { @@ -136,7 +181,7 @@ Text::_redraw (Glib::RefPtr layout) const } /* text has now been rendered in _image and is ready for blit in - * ::render + * ::render */ _need_redraw = false; @@ -150,44 +195,64 @@ Text::render (Rect const & area, Cairo::RefPtr context) const } Rect self = item_to_window (Rect (0, 0, min (_clamped_width, (double)_image->get_width ()), _image->get_height ())); - boost::optional i = self.intersection (area); - + Rect i = self.intersection (area); + if (!i) { return; } if (_need_redraw) { - redraw (context); + _redraw (); } - - Rect intersection (i.get()); + + 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) { +#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; } } @@ -195,8 +260,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; @@ -207,9 +276,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 (); @@ -218,6 +288,10 @@ Text::set_font_description (Pango::FontDescription font_description) void Text::set_color (Color color) { + if (color == _color) { + return; + } + begin_change (); _color = color; @@ -229,7 +303,7 @@ Text::set_color (Color color) end_change (); } - + void Text::dump (ostream& o) const { @@ -240,3 +314,14 @@ Text::dump (ostream& o) const o << endl; } + + +double +Text::text_width() const +{ + if (_need_redraw) { + redraw (); + } + + return _width; +}