Last improvements to line height

3 files changed, 13 insertions, 5 deletions

diff --git a/src/ui/widget/combo-tool-item.h b/src/ui/widget/combo-tool-item.h
index d2ca874f0..6a612256f 100644
--- a/src/ui/widget/combo-tool-item.h
+++ b/src/ui/widget/combo-tool-item.h
@@ -33,6 +33,7 @@ class ComboToolItemColumns : public Gtk::TreeModel::ColumnRecord {
 public:
     ComboToolItemColumns() {
         add (col_label);
+        add (col_value);
         add (col_icon);
         add (col_pixbuf);
         add (col_data);  // Used to store a pointer
@@ -40,6 +41,7 @@ public:
         add (col_sensitive);
     }
     Gtk::TreeModelColumn<Glib::ustring> col_label;
+    Gtk::TreeModelColumn<Glib::ustring> col_value;
     Gtk::TreeModelColumn<Glib::ustring> col_icon;
     Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> >   col_pixbuf;
     Gtk::TreeModelColumn<void *>        col_data;
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index c51042bac..40d5ccfcf 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -50,6 +50,7 @@ UnitTracker::UnitTracker(UnitType unit_type) :
 
         row = *(_store->append());
         row[columns.col_label    ] = unit;
+        row[columns.col_value    ] = unit;
         row[columns.col_tooltip  ] = ("");
         row[columns.col_icon     ] = "NotUsed";
         row[columns.col_sensitive] = true;
@@ -85,10 +86,13 @@ Inkscape::Util::Unit const * UnitTracker::getActiveUnit() const
     return _activeUnit;
 }
 
-void UnitTracker::changeLabel(Glib::ustring new_label, gint pos)
+void UnitTracker::changeLabel(Glib::ustring new_label, gint pos, bool onlylabel)
 {
     ComboToolItemColumns columns;
     _store->children()[pos][columns.col_label] = new_label;
+    if (!onlylabel) {
+        _store->children()[pos][columns.col_value] = new_label;
+    }
 }
 
 void UnitTracker::setActiveUnit(Inkscape::Util::Unit const *unit)
@@ -98,7 +102,7 @@ void UnitTracker::setActiveUnit(Inkscape::Util::Unit const *unit)
         ComboToolItemColumns columns;
         int index = 0;
         for (auto& row: _store->children() ) {
-            Glib::ustring storedUnit = row[columns.col_label];
+            Glib::ustring storedUnit = row[columns.col_value];
             if (!unit->abbr.compare (storedUnit)) {
                 _setActive (index);
                 break;
@@ -131,6 +135,7 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u)
     Gtk::TreeModel::Row row;
     row = *(_store->append());
     row[columns.col_label    ] = u ? u->abbr.c_str() : "";
+    row[columns.col_value    ] = u ? u->abbr.c_str() : "";
     row[columns.col_tooltip  ] = ("");
     row[columns.col_icon     ] = "NotUsed";
     row[columns.col_sensitive] = true;
@@ -143,6 +148,7 @@ void UnitTracker::prependUnit(Inkscape::Util::Unit const *u)
     Gtk::TreeModel::Row row;
     row = *(_store->prepend());
     row[columns.col_label    ] = u ? u->abbr.c_str() : "";
+    row[columns.col_value    ] = u ? u->abbr.c_str() : "";
     row[columns.col_tooltip  ] = ("");
     row[columns.col_icon     ] = "NotUsed";
     row[columns.col_sensitive] = true;
@@ -207,10 +213,10 @@ void UnitTracker::_setActive(gint active)
             Glib::ustring newAbbr( "NotFound" );
             for (auto& row: _store->children() ) {
                 if (index == _active) {
-                    oldAbbr = row[columns.col_label];
+                    oldAbbr = row[columns.col_value];
                 }
                 if (index == active) {
-                    newAbbr = row[columns.col_label];
+                    newAbbr = row[columns.col_value];
                 }
                 if (newAbbr != "NotFound" && oldAbbr != "NotFound") break;
                 ++index;
diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h
index 2af8a057f..b85da0623 100644
--- a/src/ui/widget/unit-tracker.h
+++ b/src/ui/widget/unit-tracker.h
@@ -50,7 +50,7 @@ public:
     void addAdjustment(GtkAdjustment *adj);
     void prependUnit(Inkscape::Util::Unit const *u);
     void setFullVal(GtkAdjustment *adj, gdouble val);
-    void changeLabel(Glib::ustring new_label, gint pos);
+    void changeLabel(Glib::ustring new_label, gint pos, bool onlylabel = false);
 
     ComboToolItem *create_tool_item(Glib::ustring const &label,
                                     Glib::ustring const &tooltip);