diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 33bbe9e05bda723775054098279c5cd5ce21e471..9f1126185213dec8af9ed99f95f9196fb2bc6c27 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
#endif
-
+#include "sp-item.h"
#include "svg/svg.h"
#include "print.h"
#include "display/nr-arena.h"
item->sensitive = TRUE;
- item->r_cx = 0;
- item->r_cx = 0;
+ item->transform_center_x = 0;
+ item->transform_center_y = 0;
item->transform = NR::identity();
this->updateRepr();
}
+/**
+ * Sets the transform_center_x and transform_center_y properties to retain the rotation centre
+ */
+void
+SPItem::setCenter(NR::Point object_centre) {
+ NR::Rect bbox = invokeBbox(sp_item_i2d_affine(this));
+ if (!bbox.isEmpty()) {
+ transform_center_x = object_centre[NR::X] - bbox.midpoint()[NR::X];
+ if (fabs(transform_center_x) < 1e-5) // rounding error
+ transform_center_x = 0;
+ transform_center_y = object_centre[NR::Y] - bbox.midpoint()[NR::Y];
+ if (fabs(transform_center_y) < 1e-5) // rounding error
+ transform_center_y = 0;
+ }
+}
+
+void
+SPItem::unsetCenter() {
+ transform_center_x = 0;
+ transform_center_y = 0;
+}
+
+bool SPItem::isCenterSet() {
+ return (transform_center_x != 0 || transform_center_y != 0);
+}
+
+NR::Point SPItem::getCenter() {
+ NR::Rect bbox = invokeBbox(sp_item_i2d_affine(this));
+ if (!bbox.isEmpty()) {
+ return bbox.midpoint() + NR::Point (this->transform_center_x, this->transform_center_y);
+ } else {
+ return NR::Point (0, 0); // something's wrong!
+ }
+}
+
+
namespace {
bool is_item(SPObject const &object) {
@@ -313,8 +349,8 @@ sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
sp_object_read_attr(object, "mask");
sp_object_read_attr(object, "sodipodi:insensitive");
sp_object_read_attr(object, "sodipodi:nonprintable");
- sp_object_read_attr(object, "inkscape:r_cx");
- sp_object_read_attr(object, "inkscape:r_cy");
+ sp_object_read_attr(object, "inkscape:transform-center-x");
+ sp_object_read_attr(object, "inkscape:transform-center-y");
sp_object_read_attr(object, "inkscape:connector-avoid");
if (((SPObjectClass *) (parent_class))->build) {
case SP_ATTR_CONNECTOR_AVOID:
item->avoidRef->setAvoid(value);
break;
+ case SP_ATTR_TRANSFORM_CENTER_X:
+ if (value) {
+ item->transform_center_x = g_strtod(value, NULL);
+ } else {
+ item->transform_center_x = 0;
+ }
+ break;
+ case SP_ATTR_TRANSFORM_CENTER_Y:
+ if (value) {
+ item->transform_center_y = g_strtod(value, NULL);
+ } else {
+ item->transform_center_y = 0;
+ }
+ break;
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
sp_style_read_from_object(object->style, object);
nr_arena_item_set_clip(v->arenaitem, ai);
nr_arena_item_unref(ai);
sp_clippath_set_bbox(SP_CLIPPATH(clip), NR_ARENA_ITEM_GET_KEY(v->arenaitem), &bbox);
+ SP_OBJECT(clip)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
}
}
if (flags & SP_OBJECT_WRITE_EXT) {
repr->setAttribute("sodipodi:insensitive", ( item->sensitive ? NULL : "true" ));
- repr->setAttribute("inkscape:r_cx", ( item->r_cx ? NULL : "true" ));
- repr->setAttribute("inkscape:r_cy", ( item->r_cy ? NULL : "true" ));
+ if (item->transform_center_x != 0)
+ sp_repr_set_svg_double (repr, "inkscape:transform-center-x", item->transform_center_x);
+ else
+ repr->setAttribute ("inkscape:transform-center-x", NULL);
+ if (item->transform_center_y != 0)
+ sp_repr_set_svg_double (repr, "inkscape:transform-center-y", item->transform_center_y);
+ else
+ repr->setAttribute ("inkscape:transform-center-y", NULL);
}
if (((SPObjectClass *) (parent_class))->write) {
@@ -622,6 +679,13 @@ sp_item_invoke_bbox_full(SPItem const *item, NRRect *bbox, NR::Matrix const &tra
if (((SPItemClass *) G_OBJECT_GET_CLASS(item))->bbox) {
((SPItemClass *) G_OBJECT_GET_CLASS(item))->bbox(item, 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);
+ }
}
unsigned sp_item_pos_in_parent(SPItem *item)
if (style && style->stroke.type != SP_PAINT_TYPE_NONE && !NR_DF_TEST_CLOSE (ex, 1.0, NR_EPSILON)) {
style->stroke_width.computed *= ex;
+ style->stroke_width.set = TRUE;
if (style->stroke_dash.n_dash != 0) {
int i;