several changes, major and minor, to improve threaded waveview rendering

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

diff --git a/libs/canvas/canvas/rectangle.h b/libs/canvas/canvas/rectangle.h
index ff2ff994b7917bc943b96cad73578c192de18446..b979a24430bfd12e010da03ad3cc303c54a4d15b 100644 (file)
--- a/libs/canvas/canvas/rectangle.h
+++ b/libs/canvas/canvas/rectangle.h
@@ -23,17 +23,17 @@
 #include "canvas/visibility.h"
 #include "canvas/item.h"
 #include "canvas/types.h"
-#include "canvas/outline.h"
-#include "canvas/fill.h"
 
 namespace ArdourCanvas
 {
 
-class LIBCANVAS_API Rectangle : virtual public Item, public Outline, public Fill
+class LIBCANVAS_API Rectangle : public Item
 {
 public:
-       Rectangle (Group *);
-       Rectangle (Group *, Rect const &);
+       Rectangle (Canvas*);
+       Rectangle (Canvas*, Rect const &);
+       Rectangle (Item*);
+       Rectangle (Item*, Rect const &);
        
        void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
        void compute_bounding_box () const;
@@ -64,17 +64,34 @@ public:
        void set_x1 (Coord);
        void set_y1 (Coord);
 
+        /** return @param y as a floating point fraction of the overall
+         *  height of the rectangle. @param y is in canvas coordinate space.
+         * 
+         *  A value of zero indicates that y is at the bottom of the
+         *  rectangle; a value of 1 indicates that y is at the top.
+         *
+         *  Will return zero if there is no bounding box or if y
+         *  is outside the bounding box.
+         */
+        double vertical_fraction (double y) const;
+
        enum What {
+               NOTHING = 0x0,
                LEFT = 0x1,
                RIGHT = 0x2,
                TOP = 0x4,
-               BOTTOM = 0x8
+               BOTTOM = 0x8,
+               ALL = LEFT|RIGHT|TOP|BOTTOM,
        };
 
        void set_outline_what (What);
-       void set_outline_what (int);
+       void set_outline_all () { set_outline_what (ArdourCanvas::Rectangle::ALL); }
+
+  protected:
+       void render_self (Rect const &, Cairo::RefPtr<Cairo::Context>, Rect) const;
+       Rect get_self_for_render () const;
 
-private:
+  private:
        /** Our rectangle; note that x0 may not always be less than x1
         *  and likewise with y0 and y1.
         */