Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21330
Modified Files:
ufraw_preview.c
Log Message:
Fix for a logic flaw which prevented zooming in from <100 to >100 to work
(it stopped at 100%). Based on patch by Frank van Maarseveen.
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- ufraw_preview.c 10 Nov 2009 03:44:25 -0000 1.303
+++ ufraw_preview.c 10 Nov 2009 04:39:16 -0000 1.304
@@ -1992,11 +1992,10 @@
if (data->FreezeDialog)
return;
(void)user_data;
- double newZoom = gtk_adjustment_get_value(data->ZoomAdjustment);
- if (CFG->Zoom == newZoom)
- return;
double oldZoom = CFG->Zoom;
- CFG->Zoom = newZoom;
+ CFG->Zoom = gtk_adjustment_get_value(data->ZoomAdjustment);
+ if (CFG->Zoom == oldZoom)
+ return;
// Set shrink/size values for preview rendering
CFG->shrink = zoom_to_scale(CFG->Zoom);
if (CFG->shrink==0) {
@@ -2008,11 +2007,9 @@
CFG->size = 0;
}
render_status_text(data);
- if (oldZoom>=100.0 && newZoom>=100.0) {
- gtk_image_view_set_zoom(GTK_IMAGE_VIEW(data->PreviewWidget),
- CFG->Zoom/100.0);
- } else {
- gtk_image_view_set_zoom(GTK_IMAGE_VIEW(data->PreviewWidget), 1.0);
+ gtk_image_view_set_zoom(GTK_IMAGE_VIEW(data->PreviewWidget),
+ MAX(CFG->Zoom, 100.0)/100.0);
+ if (oldZoom < 100.0 || CFG->Zoom < 100.0) {
ufraw_invalidate_layer(data->UF, ufraw_first_phase);
render_preview(data);
}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
