diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-24 01:28:21 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-24 01:28:21 +0000 |
| commit | 718f5323cdab58042763107010fafbdc697c3c4f (patch) | |
| tree | 164e442357777ac1714464415943e6869b901a8a /src/ui/widget | |
| parent | Fixing Krzysztof review (diff) | |
| parent | "Backport" some Krzysztof review parts of mirror symmetry LPE also hapens on ... (diff) | |
| download | inkscape-718f5323cdab58042763107010fafbdc697c3c4f.tar.gz inkscape-718f5323cdab58042763107010fafbdc697c3c4f.zip | |
update to trunk
(bzr r13682.1.37)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/preferences-widget.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/unit-tracker.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e906762e3..d56506d62 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -468,12 +468,8 @@ ZoomCorrRuler::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) { Glib::ustring abbr = prefs->getString("/options/zoomcorrection/unit"); if (abbr == "cm") { draw_marks(cr, 0.1, 10); - } else if (abbr == "ft") { - draw_marks(cr, 1/12.0, 12); } else if (abbr == "in") { draw_marks(cr, 0.25, 4); - } else if (abbr == "m") { - draw_marks(cr, 1/10.0, 10); } else if (abbr == "mm") { draw_marks(cr, 10, 10); } else if (abbr == "pc") { diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h index 0fe5bda80..8fa9ff304 100644 --- a/src/ui/widget/unit-tracker.h +++ b/src/ui/widget/unit-tracker.h @@ -42,8 +42,8 @@ public: Inkscape::Util::Unit const * getActiveUnit() const; void addUnit(Inkscape::Util::Unit const *u); - void prependUnit(Inkscape::Util::Unit const *u); void addAdjustment(GtkAdjustment *adj); + void prependUnit(Inkscape::Util::Unit const *u); void setFullVal(GtkAdjustment *adj, gdouble val); GtkAction *createAction(gchar const *name, gchar const *label, gchar const *tooltip); |