← Back to branch summary

~danieljabailey/inkscape/arc_node_editor

« back to all changes in this revision

Viewing changes to src/splivarot.cpp

  • Committer: Jabiertxof
  • Date: 2016-05-08 07:06:24 UTC
  • Revision ID: jtx@jtx.marker.es-20160508070624-dax0h9wikmb0uljl
https://launchpad.net/bugs/734201
fix-bug-734201. stroke-to-path doesn't scale stroke width used in markers

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/splivarot.cpp
862
862
    if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) {
863
863
        tr = stroke_scale * tr;
864
864
    }
865
 
 
 
865
    
866
866
    // total marker transform
867
867
    tr = marker_item->transform * marker->c2p * tr * transform;
868
868
 
1153
1153
        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>stroked path(s)</b> to convert stroke to path."));
1154
1154
        return;
1155
1155
    }
1156
 
 
 
1156
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
1157
    bool scale_stroke = prefs->getBool("/options/transform/stroke", true);
 
1158
    prefs->setBool("/options/transform/stroke", true);
1157
1159
    bool did = false;
1158
1160
    std::vector<SPItem*> il(selection->itemList());
1159
1161
    for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){
1503
1505
        delete res;
1504
1506
        delete orig;
1505
1507
    }
1506
 
 
 
1508
    prefs->setBool("/options/transform/stroke", scale_stroke);
1507
1509
    if (did) {
1508
1510
        DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_OUTLINE, 
1509
1511
                           _("Convert stroke to path"));