X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Ftext.cc;h=19c4b417f9dc595c74a08d16e5e9959d85cce96e;hb=a26e6fed50c1e255dac1eeb4518bab97c647ba99;hp=399488af8059835bb060266fe28bf61babb65d1a;hpb=c8e16998bf98753a4e5fc6db33d5a53e9ef55ce3;p=ardour.git diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 399488af80..19c4b417f9 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -27,8 +27,7 @@ #include "canvas/text.h" #include "canvas/canvas.h" -#include "canvas/utils.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" using namespace std; using namespace ArdourCanvas; @@ -70,8 +69,12 @@ Text::~Text () void Text::set (string const & text) { + if (text == _text) { + return; + } + begin_change (); - + _text = text; _need_redraw = true; @@ -80,52 +83,53 @@ 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 { -#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); - - int width = 0; - int height = 0; - Glib::RefPtr test_layout = foo.create_pango_layout ("H"); + 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; - } + test_layout->get_pixel_size (width, height); + + _width_correction = width*1.5; + } #else /* don't bother with a conditional here */ _width_correction = 0.0; @@ -138,7 +142,7 @@ Text::__redraw (Glib::RefPtr layout) const } layout->set_alignment (_alignment); - + int w; int h; @@ -147,26 +151,36 @@ Text::__redraw (Glib::RefPtr layout) const _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) { - set_source_rgba (img_context, _outline_color); + 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 (); - set_source_rgba (img_context, _color); + Gtkmm2ext::set_source_rgba (img_context, _color); img_context->fill (); } else { - set_source_rgba (img_context, _color); + 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; @@ -180,47 +194,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) { - begin_change (); + if (_clamped_width == w) { + return; + } + begin_change (); _clamped_width = w; - _bounding_box_dirty = true; - end_change (); + _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; } } @@ -228,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; @@ -240,7 +275,7 @@ 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; @@ -250,20 +285,24 @@ Text::set_font_description (Pango::FontDescription font_description) } 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 (contrasting_text_color (_color)); + set_outline_color (Gtkmm2ext::contrasting_text_color (_color)); } _need_redraw = true; end_change (); } - + void Text::dump (ostream& o) const { @@ -282,6 +321,6 @@ Text::text_width() const if (_need_redraw) { redraw (); } - + return _width; }