X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fruler.cc;h=9949836fa1bd5542cee115ad58669946be506f1e;hb=657ba64ad23eaaa3cbf0e2da778a185fbc47a354;hp=b538cbb3147181ef357d79d911da26211c92d081;hpb=4dc63966f0872efe768dad61eb9b8785d06b92d1;p=ardour.git

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index b538cbb314..9949836fa1 100644
--- 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,7 +35,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 +46,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 +57,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 +68,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 +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 ();
 }
@@ -98,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();
 
@@ -137,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);
@@ -155,21 +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:
-                        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/4.0);
-			break;
-		case Mark::Micro:
-			cr->rel_line_to (0, -height/16.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 ();
 
@@ -180,32 +184,32 @@ 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 ();
+		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 ();
 
-                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 ();
+		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! */
 }
@@ -217,7 +221,7 @@ Ruler::set_divide_height (double h)
 }
 
 void
-Ruler::set_divide_colors (Color t, Color b)
+Ruler::set_divide_colors (Gtkmm2ext::Color t, Gtkmm2ext::Color b)
 {
         _divider_color_bottom = b;
         _divider_color_top = t;