[Goodies-commits] r3796 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2008-01-12 09:18:27 +0000 (Sat, 12 Jan 2008)
New Revision: 3796

Modified:
   ristretto/trunk/src/navigator.c
   ristretto/trunk/src/navigator.h
   ristretto/trunk/src/picture_viewer.c
Log:
Fix scrolled-zoom (and broke preloading)


Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c	2008-01-12 09:10:14 UTC (rev 3795)
+++ ristretto/trunk/src/navigator.c	2008-01-12 09:18:27 UTC (rev 3796)
@@ -86,7 +86,6 @@
 
     RsttoNavigator      *navigator;
 
-
     gdouble              scale;
     gboolean             fit_to_screen;
     GdkPixbufRotation    rotation;
@@ -131,9 +130,11 @@
     navigator->old_position = -1;
     navigator->timeout = 5000;
     navigator->monitor = thunar_vfs_monitor_get_default();
-    navigator->max_history = 1;
     navigator->preload = FALSE;
 
+    /* Max history size (in bytes) */
+    navigator->max_history = 0;
+
     navigator->factory = thunar_vfs_thumb_factory_new(THUNAR_VFS_THUMB_SIZE_NORMAL);
 }
 

Modified: ristretto/trunk/src/navigator.h
===================================================================
--- ristretto/trunk/src/navigator.h	2008-01-12 09:10:14 UTC (rev 3795)
+++ ristretto/trunk/src/navigator.h	2008-01-12 09:18:27 UTC (rev 3796)
@@ -54,7 +54,7 @@
     GList                 *file_list;
     GList                 *file_iter;
     GList                 *history;
-    gint                   max_history;
+    gdouble                max_history;
 
     gboolean               preload;
 

Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c	2008-01-12 09:10:14 UTC (rev 3795)
+++ ristretto/trunk/src/picture_viewer.c	2008-01-12 09:18:27 UTC (rev 3796)
@@ -761,6 +761,8 @@
 {
     RsttoNavigatorEntry *entry = rstto_navigator_get_file(viewer->priv->navigator);
     gdouble scale = rstto_navigator_entry_get_scale(entry);
+    viewer->priv->zoom_mode = RSTTO_ZOOM_MODE_CUSTOM;
+    navigator->max_history = 0;
     switch(event->direction)
     {
         case GDK_SCROLL_UP: