Fix astate setting for combo parameters when setting all astate

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

diff --git a/libs/canvas/scroll_group.cc b/libs/canvas/scroll_group.cc
index 615be8007cb91f06fa423da245d1e710f794ee07..9e7732b8d232b19a6954cfb0f7b04eb005d7f0a9 100644 (file)
--- a/libs/canvas/scroll_group.cc
+++ b/libs/canvas/scroll_group.cc
@@ -20,24 +20,55 @@
 
 #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)
-       , _scroll_sensitivity (s)       
+ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s)
+       : Container (c)
+       , _scroll_sensitivity (s)
 {
 }
 
-ScrollGroup::ScrollGroup (Group* parent, Duple position, ScrollSensitivity s)
-       : Group (parent, position)
+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
 ScrollGroup::scroll_to (Duple const& d)
 {
@@ -53,13 +84,18 @@ ScrollGroup::scroll_to (Duple const& d)
 bool
 ScrollGroup::covers_canvas (Duple const& d) const
 {
-       boost::optional<Rect> r = bounding_box ();
+        boost::optional<Rect> r = bounding_box ();
 
        if (!r) {
                return false;
        }
 
-       return r->contains (d);
+        /* 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
@@ -71,7 +107,10 @@ ScrollGroup::covers_window (Duple const& d) const
                return false;
        }
 
-       Rect w = r->translate (-_scroll_offset);
+        /* Bounding box is in item coordinates, but we need
+           to consider the position of the bounding box
+           within the canvas.
+        */
 
-       return w.contains (d);
+       return r->translate (position()).contains (d);
 }