X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Ftolerance-slider.cpp;h=d89d4cf5c858299a47f1bcfe7afa7985060ae00a;hb=7391f378420d4ca5fb2a2eb2851fdd4b0682b90d;hp=fd98b0a3774dc5e1249eed57006f09d8e43b0eb4;hpb=7f73e2886dcfce90e6e242ec21d806894f67ec11;p=inkscape.git

diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index fd98b0a37..d89d4cf5c 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -56,26 +56,45 @@ ToleranceSlider::~ToleranceSlider()
 void
 ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& label2, const Glib::ustring& tip1, const Glib::ustring& tip2, const Glib::ustring& key, Registry& wr)
 {
+    // hbox = label + slider
+    //
+    // e.g. 
+    //
+    // snap distance |-------X---| 37
+    
+    // vbox = checkbutton
+    //             +
+    //           hbox
+    
     _vbox = new Gtk::VBox;
     _hbox = manage (new Gtk::HBox);
+    
     Gtk::Label *theLabel1 = manage (new Gtk::Label (label1));
     theLabel1->set_use_underline();
-    _hbox->add (*theLabel1);
-    _hscale = manage (new Gtk::HScale (0.4, 50.1, 0.1));
+    theLabel1->set_alignment(0, 0.5);
+    // align the label with the checkbox text above by indenting 22 px.
+    _hbox->pack_start(*theLabel1, Gtk::PACK_EXPAND_WIDGET, 22); 
+    _hscale = manage (new Gtk::HScale (1.0, 51, 1.0));
     theLabel1->set_mnemonic_widget (*_hscale);
     _hscale->set_draw_value (true);
     _hscale->set_value_pos (Gtk::POS_RIGHT);
     _hscale->set_size_request (100, -1);
+    _old_val = 10;
+    _hscale->set_value (_old_val);
     _tt.set_tip (*_hscale, tip1);
-    _hbox->add (*_hscale);
-    _vbox->add (*_hbox);
+    _hbox->add (*_hscale);    
+    
+    
     Gtk::Label *theLabel2 = manage (new Gtk::Label (label2));
     theLabel2->set_use_underline();
     _button = manage (new Gtk::CheckButton);
     _tt.set_tip (*_button, tip2);
     _button->add (*theLabel2);
     _button->set_alignment (0.0, 0.5);
+    
     _vbox->add (*_button);
+    // Here we need some extra pixels to get the vertical spacing right. Why? 
+    _vbox->pack_end(*_hbox, true, true, 3); // add 3 px.  
     _key = key;
     _scale_changed_connection = _hscale->signal_value_changed().connect (sigc::mem_fun (*this, &ToleranceSlider::on_scale_changed));
     _btn_toggled_connection = _button->signal_toggled().connect (sigc::mem_fun (*this, &ToleranceSlider::on_toggled));
@@ -89,7 +108,7 @@ ToleranceSlider::setValue (double val)
     Gtk::Adjustment *adj = _hscale->get_adjustment();
 
     adj->set_lower (1.0);
-    adj->set_upper (50.0);
+    adj->set_upper (51.0);
     adj->set_step_increment (1.0);
 
     if (val > 9999.9) // magic value 10000.0
@@ -125,6 +144,7 @@ ToleranceSlider::on_toggled()
 {
     if (_button->get_active())
     {
+        _old_val = _hscale->get_value();
         _hbox->set_sensitive (false);
         _hbox->show_all();
         setValue (10000.0);
@@ -134,8 +154,8 @@ ToleranceSlider::on_toggled()
     {
         _hbox->set_sensitive (true);
         _hbox->show_all();
-        setValue (50.0);
-        update (50.0);
+        setValue (_old_val);
+        update (_old_val);
     }
 }
 
@@ -161,8 +181,6 @@ ToleranceSlider::update (double val)
     repr->setAttribute(_key.c_str(), os.str().c_str());
     doc->rroot->setAttribute("sodipodi:modified", "true");
     sp_document_set_undo_sensitive (doc, saved);
-    sp_document_done (doc, SP_VERB_NONE,
-                      /* TODO: annotate */ "tolerance-slider.cpp:173");
     
     _wr->setUpdating (false);
 }