From 5e05c910c59854938df73ba276b090773e9f6d0c Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 17 Sep 2013 11:41:39 -0400 Subject: Remove compute drawbox and replace with area_elarge, make sure we use bbox (bzr r12525) --- src/display/drawing-item.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/display/drawing-item.cpp') diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 80664d822..1814dd615 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -353,7 +353,9 @@ DrawingItem::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigne if (to_update & STATE_BBOX) { // compute drawbox if (_filter && render_filters) { - _drawbox = _filter->compute_drawbox(this, _item_bbox); + Geom::IntRect newbox(*_bbox); + _filter->area_enlarge(newbox, this); + _drawbox = Geom::OptIntRect(newbox); } else { _drawbox = _bbox; } -- cgit v1.2.3 From 0f85e2c60c4406eaddc7a96d8ddcc05d36d458f2 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 18 Sep 2013 14:46:36 -0400 Subject: Remove setItemBounds and _item_bbox because aren't sensible, replace with bbox. Fixed bugs: - https://launchpad.net/bugs/243729 (bzr r12528) --- src/display/drawing-item.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/display/drawing-item.cpp') diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 1814dd615..097a5fe76 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -281,12 +281,6 @@ DrawingItem::setZOrder(unsigned z) _markForRendering(); } -void -DrawingItem::setItemBounds(Geom::OptRect const &bounds) -{ - _item_bbox = bounds; -} - /** * Update derived data before operations. * The purpose of this call is to recompute internal data which depends -- cgit v1.2.3 From 23b4c7fcb81ee195acb9bfd470723728f89bfc4a Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 19 Sep 2013 08:35:32 -0400 Subject: Revert some agressive changes and allow a seperate filter bbox for FER, should be refactored at some point. (bzr r12536) --- src/display/drawing-item.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/display/drawing-item.cpp') diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index 097a5fe76..a9836a9e3 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -281,6 +281,12 @@ DrawingItem::setZOrder(unsigned z) _markForRendering(); } +void +DrawingItem::setItemBounds(Geom::OptRect const &bounds) +{ + if (bounds) _filter_bbox = bounds; +} + /** * Update derived data before operations. * The purpose of this call is to recompute internal data which depends @@ -346,7 +352,7 @@ DrawingItem::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigne if (to_update & STATE_BBOX) { // compute drawbox - if (_filter && render_filters) { + if (_filter && render_filters && _bbox) { Geom::IntRect newbox(*_bbox); _filter->area_enlarge(newbox, this); _drawbox = Geom::OptIntRect(newbox); -- cgit v1.2.3