diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-02-10 01:37:13 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-02-10 01:37:13 +0000 |
| commit | c277415005f890aafdc1b58eeb5acf3baad6ebda (patch) | |
| tree | e7a96ec4f9ea87b695e8135361846b50f73b6a48 | |
| parent | b54c0062233680136e6e2ee7d38847da392d7523 (diff) | |
| download | nautilus-c277415005f890aafdc1b58eeb5acf3baad6ebda.tar.gz | |
Fixed bug 5903 ("Tighter Layout" can't be changed in
manual layout, but affects Clean Up by Name)
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_set_tighter_layout): When in
manual layout mode, invalidate label sizes and update
all items so the smaller caption width used for
tighter layout can take effect immediately.
* src/file-manager/fm-icon-view.c:
(update_layout_menus): Remove the code that was making
this item insensitive in manual layout.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-icon-container.c | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 9 |
4 files changed, 27 insertions, 9 deletions
@@ -1,3 +1,18 @@ +2001-02-09 John Sullivan <sullivan@eazel.com> + + Fixed bug 5903 ("Tighter Layout" can't be changed in + manual layout, but affects Clean Up by Name) + + * libnautilus-extensions/nautilus-icon-container.c: + (nautilus_icon_container_set_tighter_layout): When in + manual layout mode, invalidate label sizes and update + all items so the smaller caption width used for + tighter layout can take effect immediately. + + * src/file-manager/fm-icon-view.c: + (update_layout_menus): Remove the code that was making + this item insensitive in manual layout. + 2001-02-09 Robey Pointer <robey@eazel.com> reviewed by: Eskil Heyn Olsen <eskil@eazel.com> diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c index 87a1b806d..648cd50ea 100644 --- a/libnautilus-extensions/nautilus-icon-container.c +++ b/libnautilus-extensions/nautilus-icon-container.c @@ -4571,6 +4571,12 @@ nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container, redo_layout (container); gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]); + } else { + /* in manual layout, label sizes still change, even though + * the icons don't move. + */ + invalidate_label_sizes (container); + nautilus_icon_container_request_update_all (container); } } diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 87a1b806d..648cd50ea 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -4571,6 +4571,12 @@ nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container, redo_layout (container); gtk_signal_emit (GTK_OBJECT (container), signals[LAYOUT_CHANGED]); + } else { + /* in manual layout, label sizes still change, even though + * the icons don't move. + */ + invalidate_label_sizes (container); + nautilus_icon_container_request_update_all (container); } } diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 030cf2f25..7a6f067a5 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -544,15 +544,6 @@ update_layout_menus (FMIconView *view) /* Sort order isn't relevant for manual layout. */ nautilus_bonobo_set_sensitive (view->details->ui, COMMAND_SORT_REVERSED, is_auto_layout); - - /* FIXME bugzilla.eazel.com 5903: - * Tighter Layout is only relevant for manual layout when doing a Clean Up. - * Leaving it disabled for manual layout is therefore not correct. - * But enabling it is both potentially confusing (since it has no immediate - * effect) and causes layout problems. More info in bug report. - */ - nautilus_bonobo_set_sensitive - (view->details->ui, COMMAND_TIGHTER_LAYOUT, is_auto_layout); } /* Clean Up is only relevant for manual layout */ |