summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2018-10-05 13:31:33 +0000
committerThomas Holder <thomas@thomas-holder.de>2018-10-05 13:31:33 +0000
commitf5651cf5d63c5eb3bfc0710f2ff399e3627a963c (patch)
treea1ddf72d6393596ce0d1f0d5dfdf87dc6b0e72a0 /src/object
parentCI/AppVeyor: Try to avoid some redundant builds (diff)
downloadinkscape-f5651cf5d63c5eb3bfc0710f2ff399e3627a963c.tar.gz
inkscape-f5651cf5d63c5eb3bfc0710f2ff399e3627a963c.zip
fix 1795942 "object to path" uses outdated state
Diffstat (limited to 'src/object')
-rw-r--r--src/object/sp-clippath.cpp1
-rw-r--r--src/object/sp-hatch-path.cpp1
-rw-r--r--src/object/sp-hatch.cpp1
-rw-r--r--src/object/sp-item.cpp1
-rw-r--r--src/object/sp-solid-color.cpp1
5 files changed, 5 insertions, 0 deletions
diff --git a/src/object/sp-clippath.cpp b/src/object/sp-clippath.cpp
index 21959af41..724c715ed 100644
--- a/src/object/sp-clippath.cpp
+++ b/src/object/sp-clippath.cpp
@@ -84,6 +84,7 @@ void SPClipPath::set(unsigned int key, const gchar* value) {
break;
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
+ this->style->clear(key);
this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
} else {
SPObjectGroup::set(key, value);
diff --git a/src/object/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp
index 8da149f75..60f186212 100644
--- a/src/object/sp-hatch-path.cpp
+++ b/src/object/sp-hatch-path.cpp
@@ -106,6 +106,7 @@ void SPHatchPath::set(unsigned int key, const gchar* value)
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
+ style->clear(key);
requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
} else {
SPObject::set(key, value);
diff --git a/src/object/sp-hatch.cpp b/src/object/sp-hatch.cpp
index 5b6d034a9..5786fc98d 100644
--- a/src/object/sp-hatch.cpp
+++ b/src/object/sp-hatch.cpp
@@ -221,6 +221,7 @@ void SPHatch::set(unsigned int key, const gchar* value)
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
+ style->clear(key);
requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
} else {
SPPaintServer::set(key, value);
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index d5c02709e..14dd4c5f2 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -518,6 +518,7 @@ void SPItem::set(unsigned int key, gchar const* value) {
}
default:
if (SP_ATTRIBUTE_IS_CSS(key)) {
+ style->clear(key);
object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
} else {
SPObject::set(key, value);
diff --git a/src/object/sp-solid-color.cpp b/src/object/sp-solid-color.cpp
index 1d973766e..f1d73835c 100644
--- a/src/object/sp-solid-color.cpp
+++ b/src/object/sp-solid-color.cpp
@@ -39,6 +39,7 @@ void SPSolidColor::build(SPDocument* doc, Inkscape::XML::Node* repr) {
void SPSolidColor::set(unsigned int key, const gchar* value) {
if (SP_ATTRIBUTE_IS_CSS(key)) {
+ style->clear(key);
this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
} else {
SPPaintServer::set(key, value);