diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-08-16 18:56:38 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-08-16 18:56:38 +0000 |
| commit | 5704ecfd89253e43c7d25640dedb4c581e4b4b94 (patch) | |
| tree | 61088b0d8c3230059594809e4b52276a6c5c206b | |
| parent | b0510f9977332eaad7128dda0c9e340bf6d9e5d6 (diff) | |
| download | nautilus-5704ecfd89253e43c7d25640dedb4c581e4b4b94.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/nautilus-navigation-window.c | 3 | ||||
| -rw-r--r-- | src/nautilus-window.c | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,12 @@ 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 (draw_or_measure_label_text), (nautilus_icon_canvas_item_event): Also display whole icon text when hovering with the mouse over the diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index d39b86ec7..c49b08f80 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.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) { diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 308a06764..c5323b39f 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -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 { |