summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/unit-tracker.cpp9
-rw-r--r--src/ui/widget/unit-tracker.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index 372419c3b..c0d3eec9b 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -111,6 +111,13 @@ void UnitTracker::addAdjustment(GtkAdjustment *adj)
}
}
+void UnitTracker::addUnit(Inkscape::Util::Unit const &u)
+{
+ GtkTreeIter iter;
+ gtk_list_store_append(_store, &iter);
+ gtk_list_store_set(_store, &iter, COLUMN_STRING, u.abbr.c_str(), -1);
+}
+
void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val)
{
_priorValues[adj] = val;
@@ -232,7 +239,7 @@ void UnitTracker::_fixupAdjustments(Inkscape::Util::Unit const oldUnit, Inkscape
if ( (oldUnit.type != Inkscape::Util::UNIT_TYPE_DIMENSIONLESS)
&& (newUnit.type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) )
{
- val = newUnit.factor;
+ val = newUnit.factor * 100;
_priorValues[adj] = Inkscape::Util::Quantity::convert(oldVal, oldUnit, "px");
} else if ( (oldUnit.type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS)
&& (newUnit.type != Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) )
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 521fe50c8..cdcb07c57 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -39,6 +39,7 @@ public:
void setActiveUnitByAbbr(gchar const *abbr);
Inkscape::Util::Unit getActiveUnit() const;
+ void addUnit(Inkscape::Util::Unit const &u);
void addAdjustment(GtkAdjustment *adj);
void setFullVal(GtkAdjustment *adj, gdouble val);