summaryrefslogtreecommitdiff
path: root/libs/canvas/widget.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-01-19 20:54:24 +0100
committerPaul Davis <paul@linuxaudiosystems.com>2017-01-19 20:54:54 +0100
commit4fa4b9a1359131d861470376a34750211cf1a1ae (patch)
tree83d0395d654f9225c258456aa9e68b3ab334f945 /libs/canvas/widget.cc
parent758f183b99dadd173cc5b0f8b9e76f6cc3e02159 (diff)
remove use of boost::optional to define "undefined" Canvas::Rect, and use Rect::empty instead.
This commit includes Rect::operator bool() which might be a candidate for removal in a future commit, in an attempt to make the meaning clearer
Diffstat (limited to 'libs/canvas/widget.cc')
-rw-r--r--libs/canvas/widget.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/canvas/widget.cc b/libs/canvas/widget.cc
index d29abed259..db43a68119 100644
--- a/libs/canvas/widget.cc
+++ b/libs/canvas/widget.cc
@@ -82,15 +82,15 @@ Widget::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
return;
}
- Rect self = item_to_window (_bounding_box.get());
- boost::optional<Rect> r = self.intersection (area);
+ Rect self = item_to_window (_bounding_box);
+ Rect r = self.intersection (area);
if (!r) {
std::cerr << "no intersection\n";
return;
}
- Rect draw = r.get ();
+ Rect draw = r;
cairo_rectangle_t crect;
crect.x = draw.x0;
crect.y = draw.y0;