diff options
| -rw-r--r-- | shell/ChangeLog | 8 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d8669e5732..908e628587 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,13 @@ 2001-08-18 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c: New constant `MIN_POPUP_TREE_WIDTH'. + (pop_up_folder_bar): Make sure the pop-up is always this size or + more. + (setup_widgets): Pass %FALSE for @shrink to `e_paned_pack1()'. + (reparent_storage_set_view_box_and_destroy_popup): Likewise. + +2001-08-18 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view-menu.c (shortcut_bar_visibility_changed_cb): New, replacing `shortcut_bar_mode_changed_cb'. (folder_bar_visibility_changed_cb): New, replacing diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 60a1f35220..4d7b4632c7 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -146,7 +146,9 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; #define DEFAULT_SHORTCUT_BAR_WIDTH 100 + #define DEFAULT_TREE_WIDTH 130 +#define MIN_POPUP_TREE_WIDTH 130 #define DEFAULT_WIDTH 705 #define DEFAULT_HEIGHT 550 @@ -270,7 +272,7 @@ reparent_storage_set_view_box_and_destroy_popup (EShellView *shell_view) gtk_widget_ref (priv->storage_set_view_box); gtk_container_remove (GTK_CONTAINER (priv->folder_bar_popup), priv->storage_set_view_box); - e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, TRUE); + e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, FALSE); gtk_widget_unref (priv->storage_set_view_box); gtk_widget_destroy (priv->folder_bar_popup); @@ -439,6 +441,8 @@ pop_up_folder_bar (EShellView *shell_view) x += orig_x; y += orig_y + 2; + priv->view_hpaned_position = MAX (priv->view_hpaned_position, MIN_POPUP_TREE_WIDTH); + gtk_window_set_default_size (GTK_WINDOW (priv->folder_bar_popup), priv->view_hpaned_position, priv->view_hpaned->allocation.height); @@ -899,7 +903,7 @@ setup_widgets (EShellView *shell_view) GTK_SIGNAL_FUNC (title_bar_toggled_cb), shell_view); priv->view_hpaned = e_hpaned_new (); - e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, TRUE); + e_paned_pack1 (E_PANED (priv->view_hpaned), priv->storage_set_view_box, FALSE, FALSE); e_paned_pack2 (E_PANED (priv->view_hpaned), priv->notebook, TRUE, FALSE); e_paned_set_position (E_PANED (priv->view_hpaned), DEFAULT_TREE_WIDTH); |