diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index f1ce029f4f36b95c17bcb3c718e2bf9234dbd678..d16137c1d06a81e1854d7814e6809eb0a6b4d721 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
#include "svg/svg.h"
#include "sp-path.h"
#include "sp-shape.h"
+#include "sp-image.h"
#include "marker.h"
#include "enums.h"
#include "sp-text.h"
+#include "sp-flowtext.h"
+#include "text-editing.h"
#include "sp-item-group.h"
#include "style.h"
#include "inkscape.h"
@@ -480,7 +483,7 @@ sp_selected_path_boolop(bool_op bop, const unsigned int verb, const Glib::ustrin
// premultiply by the inverse of parent's repr
SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent));
NR::Matrix local = sp_item_i2doc_affine(parent_item);
- gchar *transform = sp_svg_transform_write(local);
+ gchar *transform = sp_svg_transform_write(local.inverse());
// now that we have the result, add it on the canvas
if ( bop == bool_op_cut || bop == bool_op_slice ) {
Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent();
// remember id
char const *id = SP_OBJECT_REPR(item)->attribute("id");
+ // remember path effect
+ char const *patheffect = SP_OBJECT_REPR(item)->attribute("inkscape:path-effect");
//If a group was selected, to not change the selection list
if (modifySelection)
// path
gchar *str = orig->svg_dump_path();
- repr->setAttribute("d", str);
+ if (patheffect)
+ repr->setAttribute("inkscape:original-d", str);
+ else
+ repr->setAttribute("d", str);
g_free(str);
// restore id
// reapply the transform
sp_item_write_transform(newitem, repr, transform);
+ // restore path effect
+ repr->setAttribute("inkscape:path-effect", patheffect);
+
//If we are not in a selected group
if (modifySelection)
selection->add(repr);
Path *
Path_for_item(SPItem *item, bool doTransformation, bool transformFull)
{
- SPCurve *curve;
+ SPCurve *curve = NULL;
if (!item)
return NULL;
if (SP_IS_SHAPE(item))
{
- curve = sp_shape_get_curve(SP_SHAPE(item));
+ if (SP_IS_PATH(item)) {
+ curve = sp_path_get_curve_for_edit(SP_PATH(item));
+ } else {
+ curve = sp_shape_get_curve(SP_SHAPE(item));
+ }
}
- else if (SP_IS_TEXT(item))
+ else if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item))
{
- curve = SP_TEXT(item)->getNormalizedBpath();
+ curve = te_get_layout(item)->convertToCurves();
}
- else
+ else if (SP_IS_IMAGE(item))
{
- curve = NULL;
+ curve = sp_image_get_curve(SP_IMAGE(item));
}
if (!curve)
return NULL;
+
NArtBpath *bpath = SP_CURVE_BPATH(curve);
if (bpath == NULL)
return NULL;