Honor attack and release parameters in a-comp's inline graph

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

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index 907fc93e99425a17efe712c143430d141610e9b4..9949836fa1bd5542cee115ad58669946be506f1e 100644 (file)
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -25,7 +25,6 @@
 #include "canvas/ruler.h"
 #include "canvas/types.h"
 #include "canvas/debug.h"
-#include "canvas/utils.h"
 #include "canvas/canvas.h"
 
 using namespace std;
@@ -36,6 +35,8 @@ Ruler::Ruler (Canvas* c, const Metric& m)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -45,6 +46,8 @@ Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -54,6 +57,8 @@ Ruler::Ruler (Item* parent, const Metric& m)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -63,6 +68,8 @@ Ruler::Ruler (Item* parent, const Metric& m, Rect const& r)
        , _metric (&m)
        , _lower (0)
        , _upper (0)
+       , _divide_height (-1.0)
+       , _font_description (0)
        , _need_marks (true)
 {
 }
@@ -81,6 +88,7 @@ void
 Ruler::set_font_description (Pango::FontDescription fd)
 {
        begin_visual_change ();
+       delete _font_description;
        _font_description = new Pango::FontDescription (fd);
        end_visual_change ();
 }
@@ -94,13 +102,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();
 
@@ -133,7 +141,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
        cr->stroke ();
 
        /* draw ticks + text */
-       
+
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
        if (_font_description) {
                layout->set_font_description (*_font_description);
@@ -151,17 +159,21 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
                } else {
                        cr->move_to (pos.x, pos.y);
                }
-               
+
                switch (m->style) {
-               case Mark::Major:
-                       cr->rel_line_to (0, -height);
-                       break;
-               case Mark::Minor:
-                       cr->rel_line_to (0, -height/2.0);
-                       break;
-               case Mark::Micro:
-                       cr->rel_line_to (0, -height/4.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 ();
 
@@ -172,11 +184,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() + .5 * (height - logical.get_height()));
+                       }
                        layout->show_in_cairo_context (cr);
                }
        }
 
+       if (_divide_height >= 0.0) {
+
+               cr->set_line_width (1.0);
+
+               Gtkmm2ext::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 ();
+
+               Gtkmm2ext::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 (Gtkmm2ext::Color t, Gtkmm2ext::Color b)
+{
+        _divider_color_bottom = b;
+        _divider_color_top = t;
+}
+
+void
+Ruler::set_metric (const Metric& m)
+{
+        _metric = &m;
+        _need_marks = true;
+        redraw ();
+}