diff options
Diffstat (limited to 'libs/canvas/box.cc')
| -rw-r--r-- | libs/canvas/box.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/canvas/box.cc b/libs/canvas/box.cc index b23deddaf4..c75bee5770 100644 --- a/libs/canvas/box.cc +++ b/libs/canvas/box.cc @@ -73,7 +73,7 @@ Box::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const void Box::compute_bounding_box () const { - _bounding_box = boost::none; + _bounding_box = Rect(); if (_items.empty()) { _bounding_box_dirty = false; @@ -83,7 +83,7 @@ Box::compute_bounding_box () const add_child_bounding_boxes (!collapse_on_hide); if (_bounding_box) { - Rect r = _bounding_box.get(); + Rect r = _bounding_box; _bounding_box = r.expand (top_padding + outline_width() + top_margin, right_padding + outline_width() + right_margin, @@ -152,7 +152,7 @@ Box::reset_self () return; } - Rect r (_bounding_box.get()); + Rect r (_bounding_box); /* XXX need to shrink by margin */ @@ -169,10 +169,10 @@ Box::reposition_children () if (homogenous) { for (std::list<Item*>::iterator i = _items.begin(); ++i != _items.end(); ++i) { - boost::optional<Rect> bb = (*i)->bounding_box(); + Rect bb = (*i)->bounding_box(); if (bb) { - largest_height = std::max (largest_height, bb.get().height()); - largest_width = std::max (largest_width, bb.get().width()); + largest_height = std::max (largest_height, bb.height()); + largest_width = std::max (largest_width, bb.width()); } } } @@ -188,19 +188,19 @@ Box::reposition_children () if (homogenous) { shift = largest_height; } else { - boost::optional<Rect> bb = (*i)->bounding_box(); + Rect bb = (*i)->bounding_box(); if (!(*i)->visible()) { /* invisible child */ if (!collapse_on_hide) { /* still add in its size */ if (bb) { - shift += bb.get().height(); + shift += bb.height(); } } } else { if (bb) { - shift += bb.get().height(); + shift += bb.height(); } } } @@ -214,17 +214,17 @@ Box::reposition_children () if (homogenous) { shift = largest_width; } else { - boost::optional<Rect> bb = (*i)->bounding_box(); + Rect bb = (*i)->bounding_box(); if (!(*i)->visible()) { if (!collapse_on_hide) { if (bb) { - shift += bb.get().width(); + shift += bb.width(); } } } else { if (bb) { - shift += bb.get().width(); + shift += bb.width(); } } } |