From c985cb5ff6c9180bd9848f953cb4a7c594b21f29 Mon Sep 17 00:00:00 2001 From: Harish Krishnaswamy Date: Mon, 14 Nov 2005 18:50:44 +0000 Subject: Revert the previous patch as it distorts the size of the dialog on some 2005-11-14 Harish Krishnaswamy * e-shell-settings-dialog.c: (set_dialog_size), (e_shell_settings_dialog_init): Revert the previous patch as it distorts the size of the dialog on some displays. svn path=/trunk/; revision=30614 --- shell/ChangeLog | 7 +++++++ shell/e-shell-settings-dialog.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index cde7ad62d6..e70a59deff 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2005-11-14 Harish Krishnaswamy + + * e-shell-settings-dialog.c: (set_dialog_size), + (e_shell_settings_dialog_init): Revert the previous + patch as it distorts the size of the dialog on some + displays. + 2005-11-10 Srinivasa Ragavan * e-shell-settings-dialog.c (set_dialog_size) diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index e9ab725338..0b96b2cf63 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -63,9 +63,9 @@ set_dialog_size (EShellSettingsDialog *dialog) pango_layout_get_pixel_size (layout, &width, NULL); - width *= 80; + width *= 60; height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) - + pango_font_metrics_get_descent (metrics)) * 40; + + pango_font_metrics_get_descent (metrics)) * 30; gtk_window_set_default_size((GtkWindow *)dialog, width, height); g_object_unref (layout); @@ -311,7 +311,7 @@ e_shell_settings_dialog_init (EShellSettingsDialog *dialog) priv->types = g_hash_table_new (g_str_hash, g_str_equal); dialog->priv = priv; - gtk_widget_hide (dialog); + load_pages (dialog); set_dialog_size (dialog); -- cgit v1.2.3