From 87d93e27330577c2fd632dbaccbd3103884aa590 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 1 Oct 2013 15:25:44 +0200 Subject: Comprehensive fix for the issues with disappearing filtered objects. Fixes #304407 and possibly a few other bugs. Revert incorrect _item_bbox changes from r12528. Fixed bugs: - https://launchpad.net/bugs/304407 (bzr r12648) --- src/sp-tref.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/sp-tref.cpp') diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 4f9947a04..1c0481547 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -148,21 +148,21 @@ void SPTRef::set(unsigned int key, const gchar* value) { void SPTRef::update(SPCtx *ctx, guint flags) { debug("0x%p",this); - SPItem::update(ctx, flags); - + unsigned childflags = flags; if (flags & SP_OBJECT_MODIFIED_FLAG) { - flags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + childflags |= SP_OBJECT_PARENT_MODIFIED_FLAG; } - - flags &= SP_OBJECT_MODIFIED_CASCADE; + childflags &= SP_OBJECT_MODIFIED_CASCADE; SPObject *child = this->stringChild; if (child) { - if ( flags || ( child->uflags & SP_OBJECT_MODIFIED_FLAG )) { - child->updateDisplay(ctx, flags); + if ( childflags || ( child->uflags & SP_OBJECT_MODIFIED_FLAG )) { + child->updateDisplay(ctx, childflags); } } + + SPItem::update(ctx, flags); } void SPTRef::modified(unsigned int flags) { -- cgit v1.2.3