remove debug output and get logic correct to cause first render to always use the...

[ardour.git] / libs / canvas / scroll_group.cc

diff --git a/libs/canvas/scroll_group.cc b/libs/canvas/scroll_group.cc
index 76bca50aeee473e6a7fef4a300606cc6e29d63f8..3feb37f83a2ccd593ed74b2d0bbec9ef63b7dad3 100644 (file)
--- a/libs/canvas/scroll_group.cc
+++ b/libs/canvas/scroll_group.cc
@@ -20,22 +20,53 @@
 
 #include "pbd/compose.h"
 
+#include "canvas/canvas.h"
 #include "canvas/debug.h"
 #include "canvas/scroll_group.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
-ScrollGroup::ScrollGroup (Group* parent, ScrollSensitivity s)
-       : Group (parent)
+ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s)
+       : Container (c)
        , _scroll_sensitivity (s)       
 {
 }
 
-ScrollGroup::ScrollGroup (Group* parent, Duple position, ScrollSensitivity s)
-       : Group (parent, position)
-       , _scroll_sensitivity (s)
+ScrollGroup::ScrollGroup (Item* parent, ScrollSensitivity s)
+       : Container (parent)
+       , _scroll_sensitivity (s)       
+{
+}
+
+void
+ScrollGroup::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
+       /* clip the draw to the area that this scroll group nominally occupies
+        * WITHOUT scroll offsets in effect
+        */
+
+       boost::optional<Rect> r = bounding_box();
+
+       if (!r) {
+               return;
+       }
+
+       Rect self (_position.x + r.get().x0,
+                  _position.y + r.get().y0,
+                  _position.x + r.get().x1,
+                  _position.y + r.get().y1);
+
+       self.x1 = min (_position.x + _canvas->width(), self.x1);
+       self.y1 = min (_position.y + _canvas->height(), self.y1);
+
+       context->save ();
+       context->rectangle (self.x0, self.y0, self.width(), self.height());
+       context->clip ();
+       
+       Container::render (area, context);
+
+       context->restore ();
 }
 
 void
@@ -49,3 +80,37 @@ ScrollGroup::scroll_to (Duple const& d)
                _scroll_offset.y = d.y;
        }
 }
+
+bool
+ScrollGroup::covers_canvas (Duple const& d) const
+{
+        boost::optional<Rect> r = bounding_box ();
+
+       if (!r) {
+               return false;
+       }
+
+        /* Bounding box is in item coordinates, but we need
+           to consider the position of the bounding box
+           within the canvas.
+        */
+        
+       return r->translate (position()).contains (d);
+}
+
+bool
+ScrollGroup::covers_window (Duple const& d) const
+{
+       boost::optional<Rect> r = bounding_box ();
+
+       if (!r) {
+               return false;
+       }
+
+        /* Bounding box is in item coordinates, but we need
+           to consider the position of the bounding box
+           within the canvas. 
+        */
+        
+       return r->translate (position()).contains (d);
+}