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/fill.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/fill.cc')
| -rw-r--r-- | libs/canvas/fill.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc index 42fe155684..9fe1d5b4e7 100644 --- a/libs/canvas/fill.cc +++ b/libs/canvas/fill.cc @@ -27,8 +27,6 @@ #include "canvas/fill.h" #include "canvas/item.h" #include "canvas/types.h" -#include "canvas/utils.h" -#include "canvas/colors.h" using namespace std; using namespace ArdourCanvas; @@ -42,14 +40,14 @@ Fill::Fill (Item& self) } void -Fill::set_fill_color (Color color) +Fill::set_fill_color (Gtkmm2ext::Color color) { if (_fill_color != color) { _self.begin_visual_change (); _fill_color = color; double r, g, b, a; - color_to_rgba (color, r, g, b, a); + Gtkmm2ext::color_to_rgba (color, r, g, b, a); if (a == 0.0) { _transparent = true; } else { @@ -76,7 +74,7 @@ Fill::setup_fill_context (Cairo::RefPtr<Cairo::Context> context) const if (_pattern) { context->set_source (_pattern); } else { - set_source_rgba (context, _fill_color); + Gtkmm2ext::set_source_rgba (context, _fill_color); } } @@ -93,7 +91,7 @@ Fill::setup_gradient_context (Cairo::RefPtr<Cairo::Context> context, Rect const for (StopList::const_iterator s = _stops.begin(); s != _stops.end(); ++s) { double r, g, b, a; - color_to_rgba (s->second, r, g, b, a); + Gtkmm2ext::color_to_rgba (s->second, r, g, b, a); _gradient->add_color_stop_rgba (s->first, r, g, b, a); } |