diff options
author | Robin Gareus <robin@gareus.org> | 2017-07-17 18:34:35 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
commit | 601c317d70a03190257577bd867cefc2c70d3275 (patch) | |
tree | 077071290f084431a912414c4e87b6127c586677 /libs/canvas/ruler.cc | |
parent | 1f5ebc54853446a786925941bd014666e75221d2 (diff) |
Clean up library inheritance (colors.h, utils.h)
make libwidget independent of libcanvas.
Confine basics to pbd and gtkmm2ext.
Diffstat (limited to 'libs/canvas/ruler.cc')
-rw-r--r-- | libs/canvas/ruler.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc index 9c1f78253f..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; @@ -199,12 +198,12 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const cr->set_line_width (1.0); - set_source_rgba (cr, _divider_color_top); + 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); + 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 (); @@ -222,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; |