nautilus r14483 - in trunk: . src

[cneumair svn gnome org]

Author: cneumair
Date: Sat Aug 16 18:56:38 2008
New Revision: 14483
URL: http://svn.gnome.org/viewvc/nautilus?rev=14483&view=rev

Log:
2008-08-16  Christian Neumair  <cneumair gnome org>

	* src/nautilus-navigation-window.c (real_sync_zoom_widgets):
	* src/nautilus-window.c (real_sync_zoom_widgets):
	Properly calculate zoom level. Issue was imported from old
	"zoom-parameters-change" cruft. Fixes #548036.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-navigation-window.c
   trunk/src/nautilus-window.c

Modified: trunk/src/nautilus-navigation-window.c
==============================================================================
--- trunk/src/nautilus-navigation-window.c	(original)
+++ trunk/src/nautilus-navigation-window.c	Sat Aug 16 18:56:38 2008
@@ -1519,7 +1519,8 @@
 
 	supports_zooming = nautilus_view_supports_zooming (view);
 	can_zoom = supports_zooming &&
-		   nautilus_view_get_zoom_level (view) != 0.0;
+		   nautilus_view_get_zoom_level (view) >= NAUTILUS_ZOOM_LEVEL_SMALLEST &&
+		   nautilus_view_get_zoom_level (view) <= NAUTILUS_ZOOM_LEVEL_LARGEST;
 
 	if (window->zoom_control != NULL) {
 		if (supports_zooming) {

Modified: trunk/src/nautilus-window.c
==============================================================================
--- trunk/src/nautilus-window.c	(original)
+++ trunk/src/nautilus-window.c	Sat Aug 16 18:56:38 2008
@@ -1326,7 +1326,9 @@
 
 	if (view != NULL) {
 		supports_zooming = nautilus_view_supports_zooming (view);
-		can_zoom = supports_zooming && nautilus_view_get_zoom_level (view) != 0.0;
+		can_zoom = supports_zooming &&
+			   nautilus_view_get_zoom_level (view) >= NAUTILUS_ZOOM_LEVEL_SMALLEST &&
+			   nautilus_view_get_zoom_level (view) <= NAUTILUS_ZOOM_LEVEL_LARGEST;
 		can_zoom_in = can_zoom && nautilus_view_can_zoom_in (view);
 		can_zoom_out = can_zoom && nautilus_view_can_zoom_out (view);
 	} else {