MIDI Transform channel-count 1..16 (not 0..15)

[ardour.git] / libs / canvas / canvas / fill.h

diff --git a/libs/canvas/canvas/fill.h b/libs/canvas/canvas/fill.h
index ae87edb2dc1c6899618d115f1ce18dc3432167f9..95a29fd760c34f7b6c5c1b52d7a8e7d15f5e1515 100644 (file)
--- a/libs/canvas/canvas/fill.h
+++ b/libs/canvas/canvas/fill.h
@@ -22,19 +22,26 @@
 
 #include <vector>
 #include <stdint.h>
-#include "canvas/item.h"
+
+#include <boost/noncopyable.hpp>
+
+#include "canvas/visibility.h"
+#include "canvas/types.h"
 
 namespace ArdourCanvas {
 
-class Fill : virtual public Item
+class Item;
+
+class LIBCANVAS_API Fill : public boost::noncopyable
 {
 public:
-       Fill (Group *);
+       Fill (Item& self);
+       virtual ~Fill() {}
 
-       virtual void set_fill_color (Color);
+       virtual void set_fill_color (Gtkmm2ext::Color);
        virtual void set_fill (bool);
 
-       Color fill_color () const {
+       Gtkmm2ext::Color fill_color () const {
                return _fill_color;
        }
 
@@ -42,16 +49,24 @@ public:
                return _fill;
        }
 
-        typedef std::vector<std::pair<double,Color> > StopList;
-       
-        void set_gradient (StopList const & stops, double height);
+       typedef std::vector<std::pair<double,Gtkmm2ext::Color> > StopList;
+
+       void set_gradient (StopList const & stops, bool is_vertical);
+
+       void set_pattern (Cairo::RefPtr<Cairo::Pattern>);
 
 protected:
        void setup_fill_context (Cairo::RefPtr<Cairo::Context>) const;
-       
-       Color _fill_color;
+       void setup_gradient_context (Cairo::RefPtr<Cairo::Context>, Rect const &, Duple const &) const;
+
+       Item& _self;
+       Gtkmm2ext::Color _fill_color;
        bool _fill;
-        Cairo::RefPtr<Cairo::LinearGradient> _gradient;
+       bool _transparent;
+       StopList _stops;
+       bool _vertical_gradient;
+       Cairo::RefPtr<Cairo::Pattern> _pattern;
+
 };
 
 }