diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-08 07:06:24 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-05-08 07:06:24 +0000 |
| commit | 626b1a569bb1a6a3fa8c03324c8066fe81332d17 (patch) | |
| tree | 6c4674cd44ad262faba514c323bf28c380d95258 /src | |
| parent | Change license in about box to GPLv3 - due to GIMP files (diff) | |
| download | inkscape-626b1a569bb1a6a3fa8c03324c8066fe81332d17.tar.gz inkscape-626b1a569bb1a6a3fa8c03324c8066fe81332d17.zip | |
fix-bug-734201. stroke-to-path doesn't scale stroke width used in markers
Fixed bugs:
- https://launchpad.net/bugs/734201
(bzr r14875)
Diffstat (limited to 'src')
| -rw-r--r-- | src/splivarot.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 461445ee0..c37df151c 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -862,7 +862,7 @@ void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Affine if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { tr = stroke_scale * tr; } - + // total marker transform tr = marker_item->transform * marker->c2p * tr * transform; @@ -1153,7 +1153,9 @@ sp_selected_path_outline(SPDesktop *desktop) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>stroked path(s)</b> to convert stroke to path.")); return; } - + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool scale_stroke = prefs->getBool("/options/transform/stroke", true); + prefs->setBool("/options/transform/stroke", true); bool did = false; std::vector<SPItem*> il(selection->itemList()); for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){ @@ -1503,7 +1505,7 @@ sp_selected_path_outline(SPDesktop *desktop) delete res; delete orig; } - + prefs->setBool("/options/transform/stroke", scale_stroke); if (did) { DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_OUTLINE, _("Convert stroke to path")); |