From 2673ef4af40b67b54a48a13db4b20f8da32dcebd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 25 Nov 2014 15:31:41 +0200 Subject: change ruler rendering to change tick heights and move text down --- libs/canvas/ruler.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'libs') diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc index 91ec576426..b88fca4d84 100644 --- a/libs/canvas/ruler.cc +++ b/libs/canvas/ruler.cc @@ -158,13 +158,17 @@ Ruler::render (Rect const & area, Cairo::RefPtr cr) const 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/4.0); break; case Mark::Micro: - cr->rel_line_to (0, -height/4.0); + cr->rel_line_to (0, -height/16.0); break; } cr->stroke (); @@ -177,7 +181,11 @@ Ruler::render (Rect const & area, Cairo::RefPtr 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); } } -- cgit v1.2.3