Inkscape

Merge lp:~doctormo/inkscape/bugfix-lp-781244 into lp:~inkscape.dev/inkscape/trunk

  1. bugfix-lp-781244
  2. Merge into trunk
Proposed by Martin Owens
Status: Merged
Merged at revision: 10217
Proposed branch: lp:~doctormo/inkscape/bugfix-lp-781244
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 13 lines (+3/-1)
1 file modified
src/widgets/toolbox.cpp (+3/-1)
To merge this branch: bzr merge lp:~doctormo/inkscape/bugfix-lp-781244
Reviewer Review Type Date Requested Status
Inkscape Developers Pending
Review via email: mp+60669@code.launchpad.net

Description of the change

Attempt to fix the grow/shink error by removing the adjustment. We remove it because it's also storing the unit of the value and we don't need to adjust the unit to an absolute unit if we're also saving the unit.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/widgets/toolbox.cpp'
2--- src/widgets/toolbox.cpp 2011-04-19 06:14:35 +0000
3+++ src/widgets/toolbox.cpp 2011-05-11 17:54:28 +0000
4@@ -8377,7 +8377,9 @@
5 SPUnit const *unit = tracker->getActiveUnit();
6 Inkscape::Preferences *prefs = Inkscape::Preferences::get();
7
8- prefs->setDouble("/tools/paintbucket/offset", (gdouble)sp_units_get_pixels(adj->value, *unit));
9+ // Don't adjust the offset value because we're saving the
10+ // unit and it'll be correctly handled on load.
11+ prefs->setDouble("/tools/paintbucket/offset", (gdouble)adj->value);
12 prefs->setString("/tools/paintbucket/offsetunits", sp_unit_get_abbreviation(unit));
13 }
14