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

[Stephan Arts]

Author: stephan
Date: 2007-08-07 08:27:31 +0000 (Tue, 07 Aug 2007)
New Revision: 2959

Modified:
   ristretto/trunk/src/main.c
Log:
scale_fit by default

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-08-07 08:02:14 UTC (rev 2958)
+++ ristretto/trunk/src/main.c	2007-08-07 08:27:31 UTC (rev 2959)
@@ -184,7 +184,7 @@
 	gtk_box_pack_start(GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(main_vbox), status_bar, FALSE, TRUE, 0);
 
-	rstto_picture_viewer_set_scale(RSTTO_PICTURE_VIEWER(viewer), 1);
+	rstto_picture_viewer_fit_scale(RSTTO_PICTURE_VIEWER(viewer));
 
 	gtk_toolbar_insert(GTK_TOOLBAR(image_tool_bar), zoom_fit, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(image_tool_bar), zoom_100, 0);
@@ -368,25 +368,28 @@
 static void
 cb_rstto_fullscreen(GtkWidget *widget, GdkEventWindowState *event, RsttoPictureViewer *viewer)
 {
-    if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
+    if(event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
     {
-        window_fullscreen = TRUE;
-        gtk_widget_hide(menu_bar);
-        gtk_widget_hide(image_tool_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);
+        if(event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
+        {
+            window_fullscreen = TRUE;
+            gtk_widget_hide(menu_bar);
+            gtk_widget_hide(image_tool_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
+        {
+            window_fullscreen = FALSE;
+            gtk_widget_show(menu_bar);
+            gtk_widget_show(image_tool_bar);
+            gtk_widget_show(app_tool_bar);
+            gtk_widget_show(status_bar);
+            rstto_picture_viewer_set_scale(viewer, viewer_scale);
+        }
     }
-    else
-    {
-        window_fullscreen = FALSE;
-        gtk_widget_show(menu_bar);
-        gtk_widget_show(image_tool_bar);
-        gtk_widget_show(app_tool_bar);
-        gtk_widget_show(status_bar);
-        rstto_picture_viewer_set_scale(viewer, viewer_scale);
-    }
 }
 
 static void