Give the Windows MMTimer test a better chance of passing

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

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index abd5b63fdbc8352f7cd42978e3a26db3c2512f97..1c11def93a8b95a586cef2aa5c11b44ade1adc0b 100644 (file)
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -31,17 +31,48 @@
 using namespace std;
 using namespace ArdourCanvas;
 
-Ruler::Ruler (Group *p, const Metric& m)
-       : Item (p)
-       , Fill (p)
-       , Outline (p)
-       , _metric (m)
+Ruler::Ruler (Canvas* c, const Metric& m)
+       : Rectangle (c)
+       , _metric (&m)
        , _lower (0)
        , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
+       , _need_marks (true)
+{
+}
+
+Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
+       : Rectangle (c, r)
+       , _metric (&m)
+       , _lower (0)
+       , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
+       , _need_marks (true)
+{
+}
+
+Ruler::Ruler (Item* parent, const Metric& m)
+       : Rectangle (parent)
+       , _metric (&m)
+       , _lower (0)
+       , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
+       , _need_marks (true)
+{
+}
+
+Ruler::Ruler (Item* parent, const Metric& m, Rect const& r)
+       : Rectangle (parent, r)
+       , _metric (&m)
+       , _lower (0)
+       , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
-       _fill_color = rgba_to_color (0, 0, 0, 1.0);
-       _outline_color = rgba_to_color (1.0, 1.0, 1.0, 1.0);
 }
 
 void
@@ -58,31 +89,11 @@ void
 Ruler::set_font_description (Pango::FontDescription fd)
 {
        begin_visual_change ();
+       delete _font_description;
        _font_description = new Pango::FontDescription (fd);
        end_visual_change ();
 }
 
-void
-Ruler::set_size (Rect const & area)
-{
-       if (_rect != area) {
-               begin_visual_change ();
-               _rect = area;
-               _bounding_box_dirty = true;
-               end_visual_change ();
-       }
-}
-
-void
-Ruler::compute_bounding_box () const
-{
-       if (!_rect.empty()) {
-               _bounding_box = _rect;
-       }
-
-       _bounding_box_dirty = false;
-}
-
 void
 Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 {
@@ -91,7 +102,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
                return;
        }
 
-       Rect self (item_to_window (_rect));
+       Rect self (item_to_window (get()));
        boost::optional<Rect> i = self.intersection (area);
 
        if (!i) {
@@ -104,7 +115,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 
        if (_need_marks) {
                marks.clear ();
-               _metric.get_marks (marks, _lower, _upper, 50);
+               _metric->get_marks (marks, _lower, _upper, 50);
                _need_marks = false;
        }
 
@@ -119,13 +130,19 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
        setup_outline_context (cr);
 
        /* draw line on lower edge as a separator */
-       
-       cr->move_to (self.x0, self.y1-0.5);
-       cr->line_to (self.x1, self.y1-0.5);
+
+       if (_outline_width == 1.0) {
+               /* Cairo single pixel line correction */
+               cr->move_to (self.x0, self.y1-0.5);
+               cr->line_to (self.x1, self.y1-0.5);
+       } else {
+               cr->move_to (self.x0, self.y1);
+               cr->line_to (self.x1, self.y1);
+       }
        cr->stroke ();
 
        /* draw ticks + text */
-       
+
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
        if (_font_description) {
                layout->set_font_description (*_font_description);
@@ -134,24 +151,29 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
        for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
                Duple pos;
 
-               pos.x = floor ((m->position - _lower) / _metric.units_per_pixel);
+               pos.x = floor ((m->position - _lower) / _metric->units_per_pixel);
                pos.y = self.y1; /* bottom edge */
 
                if (_outline_width == 1.0) {
+                       /* Cairo single pixel line correction */
                        cr->move_to (pos.x + 0.5, pos.y);
                } else {
                        cr->move_to (pos.x, pos.y);
                }
-               
+
                switch (m->style) {
                case Mark::Major:
-                       cr->rel_line_to (0, -height);
+                        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/2.0);
+                       cr->rel_line_to (0, -height/3.0);
                        break;
                case Mark::Micro:
-                       cr->rel_line_to (0, -height/4.0);
+                       cr->rel_line_to (0, -height/5.0);
                        break;
                }
                cr->stroke ();
@@ -163,11 +185,53 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 
                        layout->set_text (m->label);
                        logical = layout->get_pixel_logical_extents ();
-                       
-                       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());
+                        }
                        layout->show_in_cairo_context (cr);
                }
        }
 
+        if (_divide_height >= 0.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_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! */
 }
+
+void
+Ruler::set_divide_height (double h)
+{
+        _divide_height = h;
+}
+
+void
+Ruler::set_divide_colors (Color t, Color b)
+{
+        _divider_color_bottom = b;
+        _divider_color_top = t;
+}
+
+void
+Ruler::set_metric (const Metric& m)
+{
+        _metric = &m;
+        _need_marks = true;
+        redraw ();
+}