diff options
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 34750da285..9ff726afad 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,13 @@ +2001-09-28 Ettore Perazzoli <ettore@ximian.com> + + [Fix #8434, Shortcut bar not shown properly.] + + * e-shell-view.c (e_shell_view_show_shortcut_bar): Set the + hpaned_position from the EPaned *before* hiding it -- otherwise, + the position will of course always be zero. + (e_shell_view_save_settings): Save from ->hpaned_position and + ->view_hpaned_position. + 2001-09-28 Iain Holmes <iain@ximian.com> * importer/import.glade: Add new pages. @@ -46,7 +56,6 @@ (e_shell_view_menu_setup): Add tools verbs. 2001-09-26 Ettore Perazzoli <ettore@ximian.com> - * e-shell-view.c (setup_verb_sensitivity_for_folder): New helper function. (folder_selected_cb): Call it. diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index cc651d1d3b..7387781e54 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -2079,13 +2079,13 @@ e_shell_view_show_shortcut_bar (EShellView *shell_view, e_paned_set_position (E_PANED (priv->hpaned), priv->hpaned_position); } } else { - e_paned_set_position (E_PANED (priv->hpaned), 0); if (GTK_WIDGET_VISIBLE (priv->shortcut_frame)) { - gtk_widget_hide (priv->shortcut_frame); /* FIXME this is a private field! */ priv->hpaned_position = E_PANED (priv->hpaned)->child1_size; - e_paned_set_position (E_PANED (priv->hpaned), 0); + + gtk_widget_hide (priv->shortcut_frame); } + e_paned_set_position (E_PANED (priv->hpaned), 0); } priv->shortcut_bar_shown = !! show; @@ -2339,13 +2339,11 @@ e_shell_view_save_settings (EShellView *shell_view, g_free (key); key = g_strconcat (prefix, "HPanedPosition", NULL); - bonobo_config_set_long (db, key, - e_paned_get_position (E_PANED (priv->hpaned)), NULL); + bonobo_config_set_long (db, key, priv->hpaned_position, NULL); g_free (key); key = g_strconcat (prefix, "ViewHPanedPosition", NULL); - bonobo_config_set_long (db, key, - e_paned_get_position (E_PANED (priv->view_hpaned)), NULL); + bonobo_config_set_long (db, key, priv->view_hpaned_position, NULL); g_free (key); key = g_strconcat (prefix, "DisplayedURI", NULL); |