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

[Stephan Arts]

Author: stephan
Date: 2007-09-02 06:51:13 +0000 (Sun, 02 Sep 2007)
New Revision: 3110

Modified:
   ristretto/trunk/src/main.c
   ristretto/trunk/src/picture_viewer.c
Log:
Zoom to mouse-pointer on PictureViewer
Do not set zoom-fit when fullscreen



Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-09-01 15:44:44 UTC (rev 3109)
+++ ristretto/trunk/src/main.c	2007-09-02 06:51:13 UTC (rev 3110)
@@ -84,7 +84,6 @@
 cb_rstto_nav_file_changed(RsttoNavigator *navigator, gint nr, RsttoNavigatorEntry *entry, GtkWindow *window);
 
 static gboolean window_fullscreen = FALSE;
-static gboolean viewer_scale = 1.0;
 static GtkWidget *menu_bar;
 static GtkWidget *app_tool_bar;
 static GtkWidget *status_bar;
@@ -511,8 +510,6 @@
             gtk_widget_hide(menu_bar);
             gtk_widget_hide(app_tool_bar);
             gtk_widget_hide(status_bar);
-            viewer_scale = rstto_picture_viewer_get_scale(viewer);
-            rstto_picture_viewer_fit_scale(viewer);
         }
         else
         {
@@ -520,8 +517,6 @@
             gtk_widget_show(menu_bar);
             gtk_widget_show(app_tool_bar);
             gtk_widget_show(status_bar);
-            if(viewer_scale)
-                rstto_picture_viewer_set_scale(viewer, viewer_scale);
         }
     }
 }

Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c	2007-09-01 15:44:44 UTC (rev 3109)
+++ ristretto/trunk/src/picture_viewer.c	2007-09-02 06:51:13 UTC (rev 3110)
@@ -621,6 +621,7 @@
 {
     if (g_timer_elapsed(viewer->priv->timer, NULL) > 0.2)
     {
+        g_timer_stop(viewer->priv->timer);
         viewer->priv->timeout_id = 0;
         rstto_picture_viewer_update(viewer);
         return FALSE;
@@ -685,6 +686,8 @@
             break;
         case GDK_SCROLL_DOWN:
         case GDK_SCROLL_RIGHT:
+            viewer->hadjustment->value = (viewer->hadjustment->value + event->x) * 1.2 - event->x;
+            viewer->vadjustment->value = (viewer->vadjustment->value + event->y) * 1.2 - event->y;
             rstto_navigator_entry_set_scale(entry, scale * 1.2);
             rstto_navigator_entry_set_fit_to_screen (entry, FALSE);
             break;