summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-grid.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2011-11-04 19:59:10 +0000
committerJohan Engelen <goejendaagh@zonnet.nl>2011-11-04 19:59:10 +0000
commite9890d9640d9bb5f7dc74b377f1b220dcb1bdd96 (patch)
tree66cfcec5452e8ff4879e04771ffddd67437099e5 /src/display/canvas-grid.cpp
parentmake significant digits consistent for grids (diff)
downloadinkscape-e9890d9640d9bb5f7dc74b377f1b220dcb1bdd96.tar.gz
inkscape-e9890d9640d9bb5f7dc74b377f1b220dcb1bdd96.zip
add missing units to grid length interpretation (we have 4 different unit conversions thingies in Inkscape! ...)
Fixed bugs: - https://launchpad.net/bugs/885500 (bzr r10717)
Diffstat (limited to 'src/display/canvas-grid.cpp')
-rw-r--r--src/display/canvas-grid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index ee3b6fe5a..8428a277e 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -492,6 +492,10 @@ sp_nv_read_length(gchar const *str, guint base, gdouble *val, SPUnit const **uni
*unit = &sp_unit_get_by_id(SP_UNIT_M);
} else if (!strncmp(u, "in", 2)) {
*unit = &sp_unit_get_by_id(SP_UNIT_IN);
+ } else if (!strncmp(u, "ft", 2)) {
+ *unit = &sp_unit_get_by_id(SP_UNIT_FT);
+ } else if (!strncmp(u, "pc", 2)) {
+ *unit = &sp_unit_get_by_id(SP_UNIT_PC);
} else {
return FALSE;
}