diff options
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 37 |
2 files changed, 47 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index b75533ee72..0bb41da144 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,15 @@ 2002-09-19 Ettore Perazzoli <ettore@ximian.com> + [Fix #28495 with a lame hack that works around Bonobo sizing + brokenness] + + * e-shell-settings-dialog.c (set_dialog_size): New. + (impl_realize): Override for GtkWidget::realize; invoke + set_dialog_size() to set a minimum size. + (class_init): Install. + +2002-09-19 Ettore Perazzoli <ettore@ximian.com> + * e-shell-folder-creation-dialog.c (async_create_cb): Don't set the current folder for E_STORAGE_EXISTS. [#30533] @@ -4698,7 +4708,7 @@ (e_shell_folder_title_bar_construct): Make the name of the folder bold using it. -o2001-08-16 Ettore Perazzoli <ettore@ximian.com> +2001-08-16 Ettore Perazzoli <ettore@ximian.com> * e-gray-bar.c (endarken_style): Just hardcode the colors. diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index dcc57ce621..f0f5101d65 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -50,6 +50,23 @@ struct _EShellSettingsDialogPrivate { }; +/* FIXME ugly hack to work around that sizing of invisible widgets is broken + with Bonobo. */ + +static void +set_dialog_size (EShellSettingsDialog *dialog) +{ + GdkFont *font; + int width, height; + + font = GTK_WIDGET (dialog)->style->font; + width = gdk_string_width (font, "M") * 66; + height = (font->ascent + font->descent) * 35; + + gtk_widget_set_usize (GTK_WIDGET (dialog), width, height); +} + + /* Page handling. */ struct _Page { @@ -236,6 +253,21 @@ load_pages (EShellSettingsDialog *dialog) } +/* GtkWidget methods. */ + +static void +impl_realize (GtkWidget *widget) +{ + EShellSettingsDialog *dialog; + + dialog = E_SHELL_SETTINGS_DIALOG (widget); + + set_dialog_size (dialog); + + (* GTK_WIDGET_CLASS (parent_class)->realize) (widget); +} + + /* GtkObject methods. */ static gboolean @@ -268,10 +300,14 @@ static void class_init (EShellSettingsDialog *class) { GtkObjectClass *object_class; + GtkWidgetClass *widget_class; object_class = GTK_OBJECT_CLASS (class); object_class->destroy = impl_destroy; + widget_class = GTK_WIDGET_CLASS (class); + widget_class->realize = impl_realize; + parent_class = gtk_type_class (PARENT_TYPE); } @@ -288,7 +324,6 @@ init (EShellSettingsDialog *dialog) load_pages (dialog); gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings")); - gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450); } |