Update Russian translation

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

diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc
index a77e03020d1124b6530b9c1f674b4ee8e96d2584..f17df466151db50b94e0e94308dd37a2fdc60369 100644 (file)
--- a/libs/canvas/text.cc
+++ b/libs/canvas/text.cc
@@ -70,8 +70,12 @@ Text::~Text ()
 void
 Text::set (string const & text)
 {
+       if (text == _text) {
+               return;
+       }
+
        begin_change ();
-       
+
        _text = text;
 
        _need_redraw = true;
@@ -80,33 +84,33 @@ Text::set (string const & text)
        end_change ();
 }
 
-void
-Text::_redraw (Cairo::RefPtr<Cairo::Context> context) const
+double
+Text::width () const
 {
-       if (_text.empty()) {
-               return;
+       if (_need_redraw) {
+               _redraw  ();
        }
-
-       Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
-
-       __redraw (layout);
+       return _width;
 }
 
-void
-Text::_redraw (Glib::RefPtr<Pango::Context> context) const
+double
+Text::height () const
 {
-       if (_text.empty()) {
-               return;
+       if (_need_redraw) {
+               _redraw  ();
        }
-
-       Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
-       __redraw (layout);
+       return _height;
 }
 
 void
-Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
+Text::_redraw () const
 {
-#ifdef __APPLE__
+       assert (!_text.empty());
+       assert (_canvas);
+       Glib::RefPtr<Pango::Context> context = _canvas->get_pango_context();
+       Glib::RefPtr<Pango::Layout> 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
@@ -115,6 +119,7 @@ Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
                Gtk::Window win;
                Gtk::Label foo;
                win.add (foo);
+               win.ensure_style ();
 
                int width = 0;
                int height = 0;
@@ -138,7 +143,7 @@ Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
        }
 
        layout->set_alignment (_alignment);
-    
+
        int w;
        int h;
 
@@ -152,7 +157,7 @@ Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
 #else
        _image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, _width, _height);
 #endif
-       
+
        Cairo::RefPtr<Cairo::Context> img_context = Cairo::Context::create (_image);
 
 #ifdef __APPLE__
@@ -160,7 +165,7 @@ Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
         */
        img_context->scale (2, 2);
 #endif
-       
+
        /* and draw, in the appropriate color of course */
 
        if (_outline) {
@@ -176,7 +181,7 @@ Text::__redraw (Glib::RefPtr<Pango::Layout> layout) const
        }
 
        /* text has now been rendered in _image and is ready for blit in
-        * ::render 
+        * ::render
         */
 
        _need_redraw = false;
@@ -190,17 +195,17 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
        }
 
        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);
-       
+       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__
@@ -220,27 +225,34 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 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<Rect> ();
+               _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<Pango::Context> 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;
        }
 }
@@ -248,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;
@@ -260,7 +276,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;
@@ -272,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;
@@ -283,7 +303,7 @@ Text::set_color (Color color)
        end_change ();
 }
 
-               
+
 void
 Text::dump (ostream& o) const
 {
@@ -302,6 +322,6 @@ Text::text_width() const
     if (_need_redraw) {
         redraw ();
     }
-    
+
     return _width;
 }