From a474159bf7130e9b46a8da1efaf32e9eac4c55b7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Thu, 21 Sep 2017 23:12:27 +0200
Subject: Fix for bug #1715433 Clone original LPE can no longer be used to fill
 a powerstroke path

---
 src/sp-spiral.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/sp-spiral.cpp')

diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index d75db3daa..f59fc0720 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -436,6 +436,8 @@ Geom::Affine SPSpiral::set_transform(Geom::Affine const &xform)
 
     // Allow live effects
     if (hasPathEffect() && pathEffectsEnabled()) {
+        this->adjust_livepatheffect(xform);
+        this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
         return xform;
     }
 
-- 
cgit v1.2.3


From f318dbfe434769ab62b4f9d2971de89f1ebffc71 Mon Sep 17 00:00:00 2001
From: Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es>
Date: Mon, 9 Oct 2017 20:33:01 +0200
Subject: Fixes for transforms in LPE shapes

---
 src/sp-spiral.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/sp-spiral.cpp')

diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index f59fc0720..f35d5e86b 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -14,7 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "attributes.h"
 #include <2geom/bezier-utils.h>
@@ -429,17 +429,27 @@ void SPSpiral::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape
  */
 Geom::Affine SPSpiral::set_transform(Geom::Affine const &xform)
 {
-    // Only set transform with proportional scaling
-    if (!xform.withoutTranslation().isUniformScale()) {
-        return xform;
-    }
-
-    // Allow live effects
-    if (hasPathEffect() && pathEffectsEnabled()) {
+    if (hasPathEffect() && pathEffectsEnabled() && 
+        (this->hasPathEffectOfType(Inkscape::LivePathEffect::CLONE_ORIGINAL) || 
+        this->hasPathEffectOfType(Inkscape::LivePathEffect::BEND_PATH) || 
+        this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_MANY) ||
+        this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_STROKES) ) )
+    {
+        // if path has this LPE applied, don't write the transform to the pathdata, but write it 'unoptimized'
+        // also if the effect is type BEND PATH to fix bug #179842
         this->adjust_livepatheffect(xform);
         this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
         return xform;
     }
+    // Only set transform with proportional scaling
+    if (!xform.withoutTranslation().isUniformScale()) {
+        // Adjust livepatheffect
+        if (hasPathEffect() && pathEffectsEnabled()) {
+            this->adjust_livepatheffect(xform);
+            this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+        }
+        return xform;
+    }
 
     /* Calculate spiral start in parent coords. */
     Geom::Point pos( Geom::Point(this->cx, this->cy) * xform );
@@ -478,6 +488,9 @@ Geom::Affine SPSpiral::set_transform(Geom::Affine const &xform)
     // Adjust gradient fill
     this->adjust_gradient(xform * ret.inverse());
 
+    // Adjust livepatheffect
+    this->adjust_livepatheffect(xform);
+
     this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
 
     return ret;
-- 
cgit v1.2.3


From ee527cbb228c6fba9c83bba5058d1a68ac647060 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 14 Oct 2017 21:29:10 +0200
Subject: Fixing problems with nested LPE and convert to paths

---
 src/sp-spiral.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sp-spiral.cpp')

diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index f35d5e86b..a84fc6041 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -431,9 +431,9 @@ Geom::Affine SPSpiral::set_transform(Geom::Affine const &xform)
 {
     if (hasPathEffect() && pathEffectsEnabled() && 
         (this->hasPathEffectOfType(Inkscape::LivePathEffect::CLONE_ORIGINAL) || 
-        this->hasPathEffectOfType(Inkscape::LivePathEffect::BEND_PATH) || 
-        this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_MANY) ||
-        this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_STROKES) ) )
+         this->hasPathEffectOfType(Inkscape::LivePathEffect::BEND_PATH) || 
+         this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_MANY) ||
+         this->hasPathEffectOfType(Inkscape::LivePathEffect::FILL_BETWEEN_STROKES) ) )
     {
         // if path has this LPE applied, don't write the transform to the pathdata, but write it 'unoptimized'
         // also if the effect is type BEND PATH to fix bug #179842
-- 
cgit v1.2.3