Rename 'libs/temporal/MSVCtemporal/timecode.vcproj' to 'libs/temporal/MSVCtemporal...

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

diff --git a/libs/canvas/scroll_group.cc b/libs/canvas/scroll_group.cc
index 3feb37f83a2ccd593ed74b2d0bbec9ef63b7dad3..64b5bee1c9a9ba963437d4c45a9d6f773cd6bef5 100644 (file)
--- a/libs/canvas/scroll_group.cc
+++ b/libs/canvas/scroll_group.cc
@@ -29,13 +29,13 @@ using namespace ArdourCanvas;
 
 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)
 {
 }
 
@@ -46,16 +46,16 @@ ScrollGroup::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) c
         * WITHOUT scroll offsets in effect
         */
 
-       boost::optional<Rect> r = bounding_box();
+       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);
+       Rect self (_position.x + r.x0,
+                  _position.y + r.y0,
+                  _position.x + r.x1,
+                  _position.y + r.y1);
 
        self.x1 = min (_position.x + _canvas->width(), self.x1);
        self.y1 = min (_position.y + _canvas->height(), self.y1);
@@ -63,7 +63,7 @@ ScrollGroup::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) c
        context->save ();
        context->rectangle (self.x0, self.y0, self.width(), self.height());
        context->clip ();
-       
+
        Container::render (area, context);
 
        context->restore ();
@@ -84,7 +84,7 @@ ScrollGroup::scroll_to (Duple const& d)
 bool
 ScrollGroup::covers_canvas (Duple const& d) const
 {
-        boost::optional<Rect> r = bounding_box ();
+        Rect r = bounding_box ();
 
        if (!r) {
                return false;
@@ -94,14 +94,14 @@ ScrollGroup::covers_canvas (Duple const& d) const
            to consider the position of the bounding box
            within the canvas.
         */
-        
-       return r->translate (position()).contains (d);
+
+       return r.translate (position()).contains (d);
 }
 
 bool
 ScrollGroup::covers_window (Duple const& d) const
 {
-       boost::optional<Rect> r = bounding_box ();
+       Rect r = bounding_box ();
 
        if (!r) {
                return false;
@@ -109,8 +109,8 @@ ScrollGroup::covers_window (Duple const& d) const
 
         /* Bounding box is in item coordinates, but we need
            to consider the position of the bounding box
-           within the canvas. 
+           within the canvas.
         */
-        
-       return r->translate (position()).contains (d);
+
+       return r.translate (position()).contains (d);
 }