diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-03-16 04:15:22 +0000 |
|---|---|---|
| committer | John Smith <removethis.john.q.public@bigmail.com> | 2012-03-16 04:15:22 +0000 |
| commit | dd882dfdf6cf6ccfa55472577d89245a1e49d688 (patch) | |
| tree | 3cffc864bbcd55cb4d270d59245c2ca710bbe0e1 /src/ui/widget/object-composite-settings.cpp | |
| parent | clean up (diff) | |
| download | inkscape-dd882dfdf6cf6ccfa55472577d89245a1e49d688.tar.gz inkscape-dd882dfdf6cf6ccfa55472577d89245a1e49d688.zip | |
Fix for 950508 : Fill Stroke : Minor visual enhancements, fix for Opacity label size
(bzr r11093)
Diffstat (limited to 'src/ui/widget/object-composite-settings.cpp')
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 89a398fe2..9613f2d4f 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -62,7 +62,6 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _blur_tag(Glib::ustring(history_prefix) + ":blur"), _opacity_tag(Glib::ustring(history_prefix) + ":opacity"), _opacity_vbox(false, 0), - _opacity_label_box(false, 0), _opacity_label(_("Opacity:")), _opacity_adjustment(100.0, 0.0, 100.0, 1.0, 1.0, 0.0), _opacity_hscale(_opacity_adjustment), @@ -72,6 +71,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _fe_alignment(1, 1, 1, 1), _blocked(false) { + // Filter Effects pack_start(_fe_vbox, false, false, 2); _fe_alignment.set_padding(0, 0, 4, 0); @@ -81,9 +81,16 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co // Opacity pack_start(_opacity_vbox, false, false, 2); - _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); + if (_opacity_label.get_text().length() < 7) { + _opacity_label.set_width_chars(7); + } +#if WITH_GTKMM_2_22 + _opacity_label.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER); +#else + _opacity_label.set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER); +#endif + + _opacity_hbox.pack_start(_opacity_label, 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, 0); |