Author: abrander
Date: 2011-12-30 19:58:37 +0100 (Fri, 30 Dec 2011)
New Revision: 4083

Modified:
   trunk/src/rs-preview-widget.c
Log:
Don't set size when zooming to 100% since resampler is disabled, and make first 
render quick (Patch by Klaus Post).

Modified: trunk/src/rs-preview-widget.c
===================================================================
--- trunk/src/rs-preview-widget.c       2011-12-30 15:39:23 UTC (rev 4082)
+++ trunk/src/rs-preview-widget.c       2011-12-30 18:58:37 UTC (rev 4083)
@@ -558,6 +558,7 @@
        if (zoom_to_fit == preview->zoom_to_fit)
                return;
 
+       rs_preview_widget_quick_start(preview, TRUE);
        if (zoom_to_fit)
        {
                gint max_width, max_height;
@@ -627,11 +628,6 @@
                gtk_widget_show(preview->vscrollbar);
                gtk_widget_show(preview->hscrollbar);
 
-               rs_filter_get_size_simple(preview->filter_end[0], 
preview->request[0], &width, &height);
-               rs_filter_set_recursive(preview->filter_end[0],
-                       "width", width,
-                       "height", height,
-                       NULL);
                gdk_window_set_cursor(GTK_WIDGET(rawstudio_window)->window, 
NULL);
 
                /* Build navigator */
@@ -653,11 +649,12 @@
                gtk_widget_show_all(GTK_WIDGET(preview->navigator));
        }
 
-       rs_preview_widget_quick_start(preview, FALSE);
        preview->zoom_to_fit = zoom_to_fit;
        GtkToggleAction *fit_action = 
GTK_TOGGLE_ACTION(rs_core_action_group_get_action("ZommToFit"));
        gtk_toggle_action_set_active(fit_action, zoom_to_fit);
        rs_filter_set_recursive(RS_FILTER(preview->filter_input), 
"demosaic-allow-downscale",  preview->zoom_to_fit, NULL);
+       GTK_CATCHUP();
+       rs_preview_widget_quick_end(preview);
 }
 
 /**


_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit

Reply via email to