diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-12-28 22:04:11 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-12-28 22:04:11 +0000 |
| commit | 15171d11be84c16c712720626553f3087db00e7b (patch) | |
| tree | e0a589fb86d80a10c9ac294b376f09a9e12ab18f /src/seltrans.cpp | |
| parent | Update to trunk (diff) | |
| parent | Fix for bug #1236282 (add full keyboard navigation support for new templates ... (diff) | |
| download | inkscape-15171d11be84c16c712720626553f3087db00e7b.tar.gz inkscape-15171d11be84c16c712720626553f3087db00e7b.zip | |
Update to trunk
(bzr r11950.1.209)
Diffstat (limited to 'src/seltrans.cpp')
| -rw-r--r-- | src/seltrans.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp index f961e309d..d1d39532c 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1460,7 +1460,8 @@ Geom::Point Inkscape::SelTrans::_getGeomHandlePos(Geom::Point const &visual_hand // Calculate the absolute affine while taking into account the scaling of the stroke width Inkscape::Preferences *prefs = Inkscape::Preferences::get(); bool transform_stroke = prefs->getBool("/options/transform/stroke", true); - Geom::Affine abs_affine = get_scale_transform_for_uniform_stroke (*_bbox, _strokewidth, transform_stroke, + bool preserve = prefs->getBool("/options/preservetransform/value", false); + Geom::Affine abs_affine = get_scale_transform_for_uniform_stroke (*_bbox, _strokewidth, transform_stroke, preserve, new_bbox.min()[Geom::X], new_bbox.min()[Geom::Y], new_bbox.max()[Geom::X], new_bbox.max()[Geom::Y]); // Calculate the scaled geometrical bbox @@ -1499,15 +1500,17 @@ Geom::Point Inkscape::SelTrans::_calcAbsAffineDefault(Geom::Scale const default_ Geom::Point new_bbox_max = _visual_bbox->max() * abs_affine; bool transform_stroke = false; + bool preserve = false; gdouble strokewidth = 0; if ( _snap_bbox_type != SPItem::GEOMETRIC_BBOX) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); transform_stroke = prefs->getBool("/options/transform/stroke", true); + preserve = prefs->getBool("/options/preservetransform/value", false); strokewidth = _strokewidth; } - _absolute_affine = get_scale_transform_for_uniform_stroke (*_visual_bbox, strokewidth, transform_stroke, + _absolute_affine = get_scale_transform_for_uniform_stroke (*_visual_bbox, strokewidth, transform_stroke, preserve, new_bbox_min[Geom::X], new_bbox_min[Geom::Y], new_bbox_max[Geom::X], new_bbox_max[Geom::Y]); // return the new handle position |