diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 4dbdb127d00a99e456ec5ad5ca403e8b6408d59a..3d71443d63f6400055336c2bcea4314def8dbbaf 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
#include "sp-text.h"
#include "sp-item-rm-unsatisfied-cns.h"
#include "sp-pattern.h"
+#include "sp-switch.h"
#include "gradient-chemistry.h"
#include "prefs-utils.h"
#include "conn-avoid-ref.h"
+#include "conditions.h"
#include "libnr/nr-matrix-div.h"
#include "libnr/nr-matrix-fns.h"
static void
sp_item_init(SPItem *item)
{
- SPObject *object = SP_OBJECT(item);
+ item->init();
+}
+
+void SPItem::init() {
+ this->sensitive = TRUE;
- item->sensitive = TRUE;
+ this->transform_center_x = 0;
+ this->transform_center_y = 0;
- item->transform_center_x = 0;
- item->transform_center_y = 0;
+ this->_is_evaluated = true;
+ this->_evaluated_status = StatusUnknown;
- item->transform = NR::identity();
+ this->transform = NR::identity();
- item->display = NULL;
+ this->display = NULL;
- item->clip_ref = new SPClipPathReference(SP_OBJECT(item));
+ this->clip_ref = new SPClipPathReference(this);
{
- sigc::signal<void, SPObject *, SPObject *> cs1=item->clip_ref->changedSignal();
- sigc::slot2<void,SPObject*, SPObject *> sl1=sigc::bind(sigc::ptr_fun(clip_ref_changed), item);
+ sigc::signal<void, SPObject *, SPObject *> cs1=this->clip_ref->changedSignal();
+ sigc::slot2<void,SPObject*, SPObject *> sl1=sigc::bind(sigc::ptr_fun(clip_ref_changed), this);
cs1.connect(sl1);
}
- item->mask_ref = new SPMaskReference(SP_OBJECT(item));
- sigc::signal<void, SPObject *, SPObject *> cs2=item->mask_ref->changedSignal();
- sigc::slot2<void,SPObject*, SPObject *> sl2=sigc::bind(sigc::ptr_fun(mask_ref_changed), item);
+ this->mask_ref = new SPMaskReference(this);
+ sigc::signal<void, SPObject *, SPObject *> cs2=this->mask_ref->changedSignal();
+ sigc::slot2<void,SPObject*, SPObject *> sl2=sigc::bind(sigc::ptr_fun(mask_ref_changed), this);
cs2.connect(sl2);
- if (!object->style) object->style = sp_style_new_from_object(SP_OBJECT(item));
+ if (!this->style) this->style = sp_style_new_from_object(this);
- item->avoidRef = new SPAvoidRef(item);
+ this->avoidRef = new SPAvoidRef(this);
- new (&item->_transformed_signal) sigc::signal<void, NR::Matrix const *, SPItem *>();
+ new (&this->_transformed_signal) sigc::signal<void, NR::Matrix const *, SPItem *>();
}
bool SPItem::isVisibleAndUnlocked() const {
}
bool SPItem::isHidden() const {
+ if (!isEvaluated())
+ return true;
return style->display.computed == SP_CSS_DISPLAY_NONE;
}
}
bool SPItem::isHidden(unsigned display_key) const {
+ if (!isEvaluated())
+ return true;
for ( SPItemView *view(display) ; view ; view = view->next ) {
if ( view->key == display_key ) {
g_assert(view->arenaitem != NULL);
return true;
}
+void SPItem::setEvaluated(bool evaluated) {
+ _is_evaluated = evaluated;
+ _evaluated_status = StatusSet;
+}
+
+void SPItem::resetEvaluated() {
+ if ( StatusCalculated == _evaluated_status ) {
+ _evaluated_status = StatusUnknown;
+ bool oldValue = _is_evaluated;
+ if ( oldValue != isEvaluated() ) {
+ requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ }
+ } if ( StatusSet == _evaluated_status ) {
+ SPObject const *const parent = SP_OBJECT_PARENT(this);
+ if (SP_IS_SWITCH(parent)) {
+ SP_SWITCH(parent)->resetChildEvaluated();
+ }
+ }
+}
+
+bool SPItem::isEvaluated() const {
+ if ( StatusUnknown == _evaluated_status ) {
+ _is_evaluated = sp_item_evaluate(this);
+ _evaluated_status = StatusCalculated;
+ }
+ return _is_evaluated;
+}
+
/**
* Returns something suitable for the `Hide' checkbox in the Object Properties dialog box.
* Corresponds to setExplicitlyHidden.
item->transform_center_y = 0;
}
break;
+ case SP_PROP_SYSTEM_LANGUAGE:
+ case SP_PROP_REQUIRED_FEATURES:
+ case SP_PROP_REQUIRED_EXTENSIONS:
+ {
+ item->resetEvaluated();
+ // pass to default handler
+ }
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
sp_style_read_from_object(object->style, object);
@@ -665,6 +711,10 @@ sp_item_invoke_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transfor
sp_item_invoke_bbox_full(item, bbox, transform, 0, clear);
}
+/** Calls \a item's subclass' bounding box method; clips it by the bbox of clippath, if any; and
+ * unions the resulting bbox with \a bbox. If \a clear is true, empties \a bbox first. Passes the
+ * transform and the flags to the actual bbox methods. Note that many of subclasses (e.g. groups,
+ * clones), in turn, call this function in their bbox methods. */
void
sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags, unsigned const clear)
{
@@ -677,15 +727,25 @@ sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, NR::Matrix const &tra
bbox->x1 = bbox->y1 = -1e18;
}
+ NRRect this_bbox;
+ this_bbox.x0 = this_bbox.y0 = 1e18;
+ this_bbox.x1 = this_bbox.y1 = -1e18;
+
+ // call the subclass method
if (((SPItemClass *) G_OBJECT_GET_CLASS(item))->bbox) {
- ((SPItemClass *) G_OBJECT_GET_CLASS(item))->bbox(item, bbox, transform, flags);
+ ((SPItemClass *) G_OBJECT_GET_CLASS(item))->bbox(item, &this_bbox, transform, flags);
}
// crop the bbox by clip path, if any
if (item->clip_ref->getObject()) {
NRRect b;
sp_clippath_get_bbox(SP_CLIPPATH(item->clip_ref->getObject()), &b, transform, flags);
- nr_rect_d_intersect (bbox, bbox, &b);
+ nr_rect_d_intersect (&this_bbox, &this_bbox, &b);
+ }
+
+ // if non-empty (with some tolerance - ?) union this_bbox with the bbox we've got passed
+ if ( fabs(this_bbox.x1-this_bbox.x0) > -0.00001 && fabs(this_bbox.y1-this_bbox.y0) > -0.00001 ) {
+ nr_rect_d_union (bbox, bbox, &this_bbox);
}
}
NR::Rect sp_item_bbox_desktop(SPItem *item)
{
NRRect ret;
- sp_item_bbox_desktop(item, &ret);
+ sp_item_invoke_bbox(item, &ret, sp_item_i2d_affine(item), TRUE);
return NR::Rect(ret);
}
@@ -1147,10 +1207,11 @@ sp_item_write_transform(SPItem *item, Inkscape::XML::Node *repr, NR::Matrix cons
sp_item_adjust_paint_recursive (item, NR::identity(), NR::identity(), false);
}
- // run the object's set_transform if transforms are stored optimized
+ // run the object's set_transform if transforms are stored optimized and there's no clippath or mask
gint preserve = prefs_get_int_attribute("options.preservetransform", "value", 0);
NR::Matrix transform_attr (transform);
- if (((SPItemClass *) G_OBJECT_GET_CLASS(item))->set_transform && !preserve) {
+ if (((SPItemClass *) G_OBJECT_GET_CLASS(item))->set_transform
+ && !preserve && !item->clip_ref->getObject() && !item->mask_ref->getObject()) {
transform_attr = ((SPItemClass *) G_OBJECT_GET_CLASS(item))->set_transform(item, transform);
}
sp_item_set_item_transform(item, transform_attr);