Only call Gtk::Widget::queue_draw_area in canvas when item and visible area intersect

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

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index 74755f6eccced0de6772ee26109b4d24f86a3400..9c1f78253fbf8b9084659b7afb7c55ead4e704f5 100644 (file)
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -36,7 +36,8 @@ Ruler::Ruler (Canvas* c, const Metric& m)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
-        , _divide_height (-1.0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -46,7 +47,8 @@ Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
-        , _divide_height (-1.0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -56,7 +58,8 @@ Ruler::Ruler (Item* parent, const Metric& m)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
-        , _divide_height (-1.0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -66,7 +69,8 @@ Ruler::Ruler (Item* parent, const Metric& m, Rect const& r)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
-        , _divide_height (-1.0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -85,6 +89,7 @@ void
 Ruler::set_font_description (Pango::FontDescription fd)
 {
        begin_visual_change ();
+       delete _font_description;
        _font_description = new Pango::FontDescription (fd);
        end_visual_change ();
 }
@@ -98,13 +103,13 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
        }
 
        Rect self (item_to_window (get()));
-       boost::optional<Rect> i = self.intersection (area);
+       Rect i = self.intersection (area);
 
        if (!i) {
                return;
        }
 
-       Rect intersection (i.get());
+       Rect intersection (i);
 
        Distance height = self.height();
 
@@ -157,19 +162,19 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
                }
 
                switch (m->style) {
-               case Mark::Major:
-                        if (_divide_height >= 0) {
-                                cr->rel_line_to (0, -_divide_height);
-                        } else {
-                                cr->rel_line_to (0, -height);
-                        }
-                       break;
-               case Mark::Minor:
-                       cr->rel_line_to (0, -height/3.0);
-                       break;
-               case Mark::Micro:
-                       cr->rel_line_to (0, -height/5.0);
-                       break;
+                       case Mark::Major:
+                               if (_divide_height >= 0) {
+                                       cr->rel_line_to (0, -_divide_height);
+                               } else {
+                                       cr->rel_line_to (0, -height);
+                               }
+                               break;
+                       case Mark::Minor:
+                               cr->rel_line_to (0, -height/3.0);
+                               break;
+                       case Mark::Micro:
+                               cr->rel_line_to (0, -height/5.0);
+                               break;
                }
                cr->stroke ();
 
@@ -181,31 +186,31 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
                        layout->set_text (m->label);
                        logical = layout->get_pixel_logical_extents ();
 
-                        if (_divide_height >= 0) {
-                                cr->move_to (pos.x + 2.0, self.y0 + _divide_height + logical.get_y() + 2.0); /* 2 pixel padding below divider */
-                        } else {
-                                cr->move_to (pos.x + 2.0, self.y0 + logical.get_y());
-                        }
+                       if (_divide_height >= 0) {
+                               cr->move_to (pos.x + 2.0, self.y0 + _divide_height + logical.get_y() + 2.0); /* 2 pixel padding below divider */
+                       } else {
+                               cr->move_to (pos.x + 2.0, self.y0 + logical.get_y() + .5 * (height - logical.get_height()));
+                       }
                        layout->show_in_cairo_context (cr);
                }
        }
 
-        if (_divide_height >= 0.0) {
+       if (_divide_height >= 0.0) {
 
-                cr->set_line_width (1.0);
+               cr->set_line_width (1.0);
 
-                set_source_rgba (cr, _divider_color_top);
-                cr->move_to (self.x0, self.y0 + _divide_height-1.0+0.5);
-                cr->line_to (self.x1, self.y0 + _divide_height-1.0+0.5);
-                cr->stroke ();
+               set_source_rgba (cr, _divider_color_top);
+               cr->move_to (self.x0, self.y0 + _divide_height-1.0+0.5);
+               cr->line_to (self.x1, self.y0 + _divide_height-1.0+0.5);
+               cr->stroke ();
 
-                set_source_rgba (cr, _divider_color_bottom);
-                cr->move_to (self.x0, self.y0 + _divide_height+0.5);
-                cr->line_to (self.x1, self.y0 + _divide_height+0.5);
-                cr->stroke ();
+               set_source_rgba (cr, _divider_color_bottom);
+               cr->move_to (self.x0, self.y0 + _divide_height+0.5);
+               cr->line_to (self.x1, self.y0 + _divide_height+0.5);
+               cr->stroke ();
 
 
-        }
+       }
 
        /* done! */
 }