diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-02-11 11:39:53 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-02-11 11:39:53 +0000 |
| commit | 4c52ed01caef79ee62c965ac22bbfffa4d42b375 (patch) | |
| tree | 365def34a47a37c232927b21ca2933955e7c22e1 /src/extension/internal/grid.cpp | |
| parent | update to trunk (diff) | |
| parent | Set 'preserveAspectRatio' to 'none' when importing an image. (diff) | |
| download | inkscape-4c52ed01caef79ee62c965ac22bbfffa4d42b375.tar.gz inkscape-4c52ed01caef79ee62c965ac22bbfffa4d42b375.zip | |
update to trunk
(bzr r11950.1.253)
Diffstat (limited to 'src/extension/internal/grid.cpp')
| -rw-r--r-- | src/extension/internal/grid.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 2f9d0ff25..c2ef2b27c 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -112,11 +112,13 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc bounding_area = temprec; } - float spacings[2] = { module->get_param_float("xspacing"), - module->get_param_float("yspacing") }; - float line_width = module->get_param_float("lineWidth"); - float offsets[2] = { module->get_param_float("xoffset"), - module->get_param_float("yoffset") }; + gdouble scale = Inkscape::Util::Quantity::convert(1, "px", (document->doc())->getDefaultUnit()); + bounding_area *= Geom::Scale(scale); + float spacings[2] = { scale*module->get_param_float("xspacing"), + scale*module->get_param_float("yspacing") }; + float line_width = scale*module->get_param_float("lineWidth"); + float offsets[2] = { scale*module->get_param_float("xoffset"), + scale*module->get_param_float("yoffset") }; Glib::ustring path_data(""); |