gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-29 03:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly calculate zoom level. Issue was imported from old

Browse source 
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
This commit is contained in:
Christian Neumair 2008-08-16 18:56:38 +00:00 committed by Christian Neumair
parent b0510f9977
commit 5704ecfd89
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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

3
src/nautilus-navigation-window.c
View file

@ -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) {

4
src/nautilus-window.c
View file

@ -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 {