ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s)
: Container (c)
- , _scroll_sensitivity (s)
+ , _scroll_sensitivity (s)
{
}
ScrollGroup::ScrollGroup (Item* parent, ScrollSensitivity s)
: Container (parent)
- , _scroll_sensitivity (s)
+ , _scroll_sensitivity (s)
{
}
return;
}
- Rect self (_position.x, _position.y, _position.x + r.get().width(), _position.y + r.get().height());
+ 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 ();
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
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);
}