Commit 5704ecfd authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair

Properly calculate zoom level. Issue was imported from old

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.

svn path=/trunk/; revision=14483
parent b0510f99
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.
2008-08-16 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-icon-canvas-item.c
......
......@@ -1519,7 +1519,8 @@ real_sync_zoom_widgets (NautilusWindow *nautilus_window)
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) {
......
......@@ -1326,7 +1326,9 @@ real_sync_zoom_widgets (NautilusWindow *window)
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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment