Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30215
Modified Files:
dcraw_api.h ufraw_preview.c
Log Message:
Make sure that there are no scroll-bars on the initial preview.
Index: dcraw_api.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- dcraw_api.h 28 Nov 2009 05:56:51 -0000 1.38
+++ dcraw_api.h 2 Dec 2009 02:30:26 -0000 1.39
@@ -16,10 +16,6 @@
#ifndef _DCRAW_API_H
#define _DCRAW_API_H
-#ifdef HAVE_LENSFUN
-#include <lensfun.h>
-#endif /* HAVE_LENSFUN */
-
#ifdef __cplusplus
extern "C" {
#endif
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- ufraw_preview.c 1 Dec 2009 03:30:57 -0000 1.319
+++ ufraw_preview.c 2 Dec 2009 02:30:26 -0000 1.320
@@ -5786,9 +5786,6 @@
gtk_widget_set_size_request(scroll, preview_width+1, preview_height+1);
while (gtk_events_pending()) gtk_main_iteration();
#endif
- /* After window size was set, the user may want to shrink it */
- gtk_widget_set_size_request(scroll, -1, -1);
-
if ( CFG->WindowMaximized ) {
// scroll widget is allocated size only after gtk_widget_show_all()
int scrollWidth = scroll->allocation.width;
@@ -5806,8 +5803,6 @@
gtk_image_view_set_pixbuf(GTK_IMAGE_VIEW(data->PreviewWidget),
data->PreviewPixbuf, FALSE);
g_object_unref(data->PreviewPixbuf);
- // Get the empty preview displayed
- while (gtk_events_pending()) gtk_main_iteration();
for (i=0; i<cursor_num; i++)
data->Cursor[i] = gdk_cursor_new(Cursors[i]);
@@ -5818,6 +5813,11 @@
preview_progress_disable(data);
gtk_widget_set_sensitive(data->Controls, TRUE);
+ /* After window size was set, the user may want to re-size it.
+ * This function is called after the progress-bar text was set,
+ * to make sure that there are no scroll-bars on the initial preview. */
+ gtk_widget_set_size_request(scroll, -1, -1);
+
// Set shrink/size values for preview rendering
CFG->shrink = zoom_to_scale(CFG->Zoom);
if (CFG->shrink==0) {
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
