summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-06-10 20:20:18 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-08-05 00:31:06 +0000
commit850515e890b2bebbac5dcde3b04d3fc0cff52654 (patch)
tree29bf5ff744acaedf5bc3ad5d7c831d6a618d2a71 /src/object
parentAllow inkscape handle units and percent in dasharray and dashoffset. Add pref... (diff)
downloadinkscape-850515e890b2bebbac5dcde3b04d3fc0cff52654.tar.gz
inkscape-850515e890b2bebbac5dcde3b04d3fc0cff52654.zip
Revert changes
Diffstat (limited to 'src/object')
-rw-r--r--src/object/sp-item.cpp5
-rw-r--r--src/object/sp-item.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index fd27a6e90..ec92c655f 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -1307,10 +1307,9 @@ void SPItem::adjust_stroke( gdouble ex )
if ( !style->stroke_dasharray.values.empty() ) {
for (unsigned i = 0; i < style->stroke_dasharray.values.size(); i++) {
- style->stroke_dasharray.values[i].scale(ex);
+ style->stroke_dasharray.values[i] *= ex;
}
- style->stroke_dashoffset.value = style->stroke_dashoffset.value * ex;
- style->stroke_dashoffset.computed = style->stroke_dashoffset.computed * ex;
+ style->stroke_dashoffset.value *= ex;
}
updateRepr();
diff --git a/src/object/sp-item.h b/src/object/sp-item.h
index 9651f9f26..f6a6781e9 100644
--- a/src/object/sp-item.h
+++ b/src/object/sp-item.h
@@ -395,7 +395,7 @@ public:
virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const;
virtual void print(SPPrintContext *ctx);
- virtual const char* displayName() const;
+ virtual const char* displayName() const;
virtual char* description() const;
virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
virtual void hide(unsigned int key);