Added percent support back to select toolbar.

(bzr r12380.1.53)

3 files changed, 16 insertions, 7 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);
 
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 617757845..ab6d6ca3b 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -89,7 +89,7 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
             };
 
             if (unit.type == Inkscape::Util::UNIT_TYPE_DIMENSIONLESS) {
-                double const val = unit.factor;
+                double const val = unit.factor * 100;
                 for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) {
                     GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key));
                     gtk_adjustment_set_value(a, val);
@@ -202,13 +202,13 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         y1 = y0 + Quantity::convert(gtk_adjustment_get_value(a_h), unit, "px");;
         yrel = Quantity::convert(gtk_adjustment_get_value(a_h), unit, "px") / bbox_user->dimensions()[Geom::Y];
     } else {
-        double const x0_propn = gtk_adjustment_get_value (a_x) * unit.factor;
+        double const x0_propn = gtk_adjustment_get_value (a_x) / 100 / unit.factor;
         x0 = bbox_user->min()[Geom::X] * x0_propn;
-        double const y0_propn = gtk_adjustment_get_value (a_y) * unit.factor;
+        double const y0_propn = gtk_adjustment_get_value (a_y) / 100 / unit.factor;
         y0 = y0_propn * bbox_user->min()[Geom::Y];
-        xrel = gtk_adjustment_get_value (a_w) * unit.factor;
+        xrel = gtk_adjustment_get_value (a_w) / 100 / unit.factor;
         x1 = x0 + xrel * bbox_user->dimensions()[Geom::X];
-        yrel = gtk_adjustment_get_value (a_h) * unit.factor;
+        yrel = gtk_adjustment_get_value (a_h) / 100 / unit.factor;
         y1 = y0 + yrel * bbox_user->dimensions()[Geom::Y];
     }
 
@@ -493,7 +493,8 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
 
     // Create the units menu.
     UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR);
-    //tracker->addUnit( SP_UNIT_PERCENT, 0 );
+    Inkscape::Util::UnitTable unit_table;
+    tracker->addUnit(unit_table.getUnit("%"));
     tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units );
 
     g_object_set_data( G_OBJECT(spw), "tracker", tracker );