summaryrefslogtreecommitdiffstats
path: root/src/widgets/select-toolbar.cpp
diff options
context:
space:
mode:
authorAlvin Penner <penner@vaxxine.com>2014-01-04 22:37:17 +0000
committerapenner <penner@vaxxine.com>2014-01-04 22:37:17 +0000
commite2b4cd6d88088f5be17bff214c62d85f2030eb20 (patch)
tree316ae1201e094ce0a5fc748144dafde34401e269 /src/widgets/select-toolbar.cpp
parentFix for bug #1057494 (Remove Manual Kerns hides the selected text). (diff)
downloadinkscape-e2b4cd6d88088f5be17bff214c62d85f2030eb20.tar.gz
inkscape-e2b4cd6d88088f5be17bff214c62d85f2030eb20.zip
modify get_scale_transform_for_variable_stroke() to be consistent with get_scale_transform_for_uniform_stroke() (Bug 1262146)
Fixed bugs: - https://launchpad.net/bugs/1262146 (bzr r12881)
Diffstat (limited to 'src/widgets/select-toolbar.cpp')
-rw-r--r--src/widgets/select-toolbar.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index cf772320f..1cd4347d6 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -249,11 +249,12 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
// FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed
sp_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0);
- int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
+ bool transform_stroke = prefs->getBool("/options/transform/stroke", true);
+ bool preserve = prefs->getBool("/options/preservetransform/value", false);
Geom::Affine scaler;
if (bbox_type == SPItem::VISUAL_BBOX) {
- scaler = get_scale_transform_for_variable_stroke (*bbox_vis, *bbox_geom, transform_stroke, x0, y0, x1, y1);
+ scaler = get_scale_transform_for_variable_stroke (*bbox_vis, *bbox_geom, transform_stroke, preserve, x0, y0, x1, y1);
} else {
// 1) We could have use the newer get_scale_transform_for_variable_stroke() here, but to avoid regressions
// we'll just use the old get_scale_transform_for_uniform_stroke() for now.