Fix for 950508 : Fill Stroke : Minor visual enhancements

(bzr r11090)

3 files changed, 23 insertions, 16 deletions

diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 6fe21319d..1b2e23bc4 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -22,26 +22,30 @@ namespace UI {
 namespace Widget {
 
 SimpleFilterModifier::SimpleFilterModifier(int flags)
-    : _lb_blend(_("Blend mode:")),
-#if WITH_GTKMM_2_22
-      _lb_blur(_("_Blur:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, true),
-#else
-      _lb_blur(_("_Blur:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, true),
-#endif
+    : _hb_blur(false, 0),
+      _hb_blur_label(false, 0),
+      _lb_blend(_("Blend mode:")),
+      _lb_blur(_("_Blur:")),
       _blend(BlendModeConverter, SP_ATTR_INVALID, false),
-      _blur(0, 0, 100, 1, 0.01, 2)
+      _blur(0, 0, 100, 1, 0.01, 1)
 {
     _flags = flags;
 
     if (flags & BLEND) {
         add(_hb_blend);
-        _hb_blend.pack_start(_lb_blend, false, false);
+        _hb_blend.pack_start(_lb_blend);
         _hb_blend.pack_start(_blend);
     }
     if (flags & BLUR) {
-        add(_vb_blur);
-        _vb_blur.add(_lb_blur);
-        _vb_blur.add(_blur);
+        add(_hb_blur);
+        /*
+         * This size should match _opacity_label_box in object-composite-settings.cpp so the
+         * controls line up in Fill and Stroke dialog.
+         */
+        _hb_blur_label.set_size_request(55, 0);
+        _hb_blur_label.pack_end(_lb_blur, false, false, 0);
+        _hb_blur.pack_start(_hb_blur_label, false, false, 0);
+        _hb_blur.pack_start(_blur, true, true, 0);
     }
 
     show_all_children();
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 3c3da6c2d..f7a403762 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -49,7 +49,8 @@ public:
 private:
     int _flags;
     Gtk::HBox _hb_blend;
-    Gtk::VBox _vb_blur;
+    Gtk::HBox _hb_blur;
+    Gtk::HBox _hb_blur_label;
     Gtk::Label _lb_blend, _lb_blur;
     ComboBoxEnum<Inkscape::Filters::FilterBlendMode> _blend;
     SpinSlider _blur;
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index afeec5492..89a398fe2 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -63,7 +63,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
   _opacity_tag(Glib::ustring(history_prefix) + ":opacity"),
   _opacity_vbox(false, 0),
   _opacity_label_box(false, 0),
-  _opacity_label(_("_Opacity (%):"), 0.0, 1.0, true),
+  _opacity_label(_("Opacity:")),
   _opacity_adjustment(100.0, 0.0, 100.0, 1.0, 1.0, 0.0),
   _opacity_hscale(_opacity_adjustment),
   _opacity_spin_button(_opacity_adjustment, 0.01, 1),
@@ -81,10 +81,12 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     // Opacity
     pack_start(_opacity_vbox, false, false, 2);
-    _opacity_label_box.pack_start(_opacity_label, false, false, 4);
-    _opacity_vbox.pack_start(_opacity_label_box, false, false, 0);
+    _opacity_label_box.pack_end(_opacity_label, false, false, 0);
+    _opacity_label_box.set_size_request(55, 0);
+    _opacity_hbox.pack_start(_opacity_label_box, false, false, 3);
+    //_opacity_vbox.pack_start(_opacity_label_box, false, false, 0);
     _opacity_vbox.pack_start(_opacity_hbox, false, false, 0);
-    _opacity_hbox.pack_start(_opacity_hscale, true, true, 4);
+    _opacity_hbox.pack_start(_opacity_hscale, true, true, 0);
     _opacity_hbox.pack_start(_opacity_spin_button, false, false, 0);
     _opacity_hscale.set_draw_value(false);
     _opacity_adjustment.signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));