diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-02-20 19:33:10 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-02-20 19:33:10 +0000 |
| commit | 2be0ed515cf4159244efde50587e869114a64835 (patch) | |
| tree | fc0a4450788b62cc1bb2fd7eec2145bde9ce979f | |
| parent | 71dc5aecd6b52243f43a4356299f7e6de4db4b2a (diff) | |
| download | nautilus-2be0ed515cf4159244efde50587e869114a64835.tar.gz | |
reviewed by: Gene Ragan <gzr@eazel.com>
Fixed bug 5482 (If you've esc'd out of an icon stretch, change
directories, then come back, the icon is the pre-esc'd stretched
size)
* libnautilus-extensions/nautilus-icon-container.c:
(undo_stretching): Pass TRUE instead of FALSE so the "undone" size
gets stored in metadata. Without this, we end up with the icon at
the stretched size.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-icon-container.c | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 7 |
3 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,16 @@ +2001-02-20 Darin Adler <darin@eazel.com> + + reviewed by: Gene Ragan <gzr@eazel.com> + + Fixed bug 5482 (If you've esc'd out of an icon stretch, change + directories, then come back, the icon is the pre-esc'd stretched + size) + + * libnautilus-extensions/nautilus-icon-container.c: + (undo_stretching): Pass TRUE instead of FALSE so the "undone" size + gets stored in metadata. Without this, we end up with the icon at + the stretched size. + 2001-02-20 Richard Boulton <richard@tartarus.org> reviewed by: Ali Abdin <aliabdin@aucegypt.edu> diff --git a/libnautilus-extensions/nautilus-icon-container.c b/libnautilus-extensions/nautilus-icon-container.c index 762349e87..dcee6e34a 100644 --- a/libnautilus-extensions/nautilus-icon-container.c +++ b/libnautilus-extensions/nautilus-icon-container.c @@ -3,7 +3,7 @@ /* nautilus-icon-container.c - Icon container widget. Copyright (C) 1999, 2000 Free Software Foundation - Copyright (C) 2000 Eazel, Inc. + Copyright (C) 2000, 2001 Eazel, Inc. The Gnome Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -20,7 +20,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Authors: Ettore Perazzoli <ettore@gnu.org>, Darin Adler <darin@eazel.com> + Authors: Ettore Perazzoli <ettore@gnu.org>, + Darin Adler <darin@eazel.com> */ #include <config.h> @@ -2670,7 +2671,7 @@ undo_stretching (NautilusIconContainer *container) icon_set_size (container, stretched_icon, container->details->stretch_initial_size, - FALSE); + TRUE); container->details->stretch_icon = NULL; emit_stretch_ended (container, stretched_icon); diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 762349e87..dcee6e34a 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3,7 +3,7 @@ /* nautilus-icon-container.c - Icon container widget. Copyright (C) 1999, 2000 Free Software Foundation - Copyright (C) 2000 Eazel, Inc. + Copyright (C) 2000, 2001 Eazel, Inc. The Gnome Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -20,7 +20,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Authors: Ettore Perazzoli <ettore@gnu.org>, Darin Adler <darin@eazel.com> + Authors: Ettore Perazzoli <ettore@gnu.org>, + Darin Adler <darin@eazel.com> */ #include <config.h> @@ -2670,7 +2671,7 @@ undo_stretching (NautilusIconContainer *container) icon_set_size (container, stretched_icon, container->details->stretch_initial_size, - FALSE); + TRUE); container->details->stretch_icon = NULL; emit_stretch_ended (container, stretched_icon); |