diff options
| author | Denis Declara <declara91@gmail.com> | 2012-03-21 18:16:04 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-03-21 18:16:04 +0000 |
| commit | fbf20a8af5f761390e447ac50c52135020dabf32 (patch) | |
| tree | 895a98b0ef06eb68ace64bd1fcfb7ee5b0af48a8 /src/ui/widget/object-composite-settings.cpp | |
| parent | Merged with trunk (diff) | |
| parent | Preferences. New desktop integration preference for Windows users (native/gtk... (diff) | |
| download | inkscape-fbf20a8af5f761390e447ac50c52135020dabf32.tar.gz inkscape-fbf20a8af5f761390e447ac50c52135020dabf32.zip | |
trunk merge
(bzr r11073.1.2)
Diffstat (limited to 'src/ui/widget/object-composite-settings.cpp')
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 9613f2d4f..fd9d71d6a 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -81,9 +81,6 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co // Opacity pack_start(_opacity_vbox, false, false, 2); - 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 @@ -99,6 +96,11 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co _opacity_adjustment.signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged)); _opacity_label.set_mnemonic_widget(_opacity_hscale); + /* SizeGroup keeps the blur and opacity labels aligned in Fill & Stroke dlg */ + GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(labels, (GtkWidget *) _opacity_label.gobj()); + gtk_size_group_add_widget(labels, (GtkWidget *) _fe_cb.get_blur_label()->gobj()); + show_all_children(); _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this ); |