From 24c7fc1e8dbfd021c93b14b08dfb70738f829df2 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 21 Sep 2007 12:19:00 +0000 Subject: [PATCH] formatting. 2007-09-21 Sven Neumann * libgimpwidgets/gimppreview.c: formatting. * libgimpwidgets/gimpscrolledpreview.c: make use of freeze/thaw to reduce the number of updates during initialization. svn path=/trunk/; revision=23602 --- ChangeLog | 7 +++++++ libgimpwidgets/gimppreview.c | 9 ++++----- libgimpwidgets/gimpscrolledpreview.c | 13 ++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e80206996..135095c491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-21 Sven Neumann + + * libgimpwidgets/gimppreview.c: formatting. + + * libgimpwidgets/gimpscrolledpreview.c: make use of freeze/thaw to + reduce the number of updates during initialization. + 2007-09-21 Sven Neumann * app/file/file-open.c (file_open_image): set the image clean diff --git a/libgimpwidgets/gimppreview.c b/libgimpwidgets/gimppreview.c index 390045eaa7..6ac4306680 100644 --- a/libgimpwidgets/gimppreview.c +++ b/libgimpwidgets/gimppreview.c @@ -273,7 +273,7 @@ gimp_preview_init (GimpPreview *preview) GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); gtk_widget_show (priv->controls); - /* toggle button to (des)activate the instant preview */ + /* toggle button to (de)activate the instant preview */ preview->toggle = gtk_check_button_new_with_mnemonic (_("_Preview")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview->toggle), preview->update_preview); @@ -468,11 +468,10 @@ gimp_preview_notify_checks (GimpPreview *preview) static gboolean gimp_preview_invalidate_now (GimpPreview *preview) { - GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (preview)); - GimpPreviewClass *class = GIMP_PREVIEW_GET_CLASS (preview); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (preview)); + GimpPreviewClass *class = GIMP_PREVIEW_GET_CLASS (preview); - if (class->draw) - class->draw (preview); + gimp_preview_draw (preview); preview->timeout_id = 0; diff --git a/libgimpwidgets/gimpscrolledpreview.c b/libgimpwidgets/gimpscrolledpreview.c index f5828ecd7a..f030f6ab57 100644 --- a/libgimpwidgets/gimpscrolledpreview.c +++ b/libgimpwidgets/gimpscrolledpreview.c @@ -155,7 +155,7 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview) priv->vscr_policy = GTK_POLICY_AUTOMATIC; priv->in_drag = FALSE; - priv->frozen = 0; + priv->frozen = 1; /* we are frozen during init */ /* scrollbars */ adj = gtk_adjustment_new (0, 0, GIMP_PREVIEW (preview)->width - 1, 1.0, @@ -219,6 +219,8 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview) g_signal_connect (preview->nav_icon, "button-press-event", G_CALLBACK (gimp_scrolled_preview_nav_button_press), preview); + + priv->frozen = 0; /* thaw without actually calling draw/invalidate */ } static void @@ -305,6 +307,8 @@ gimp_scrolled_preview_area_size_allocate (GtkWidget *widget, gint width = GIMP_PREVIEW (preview)->xmax - GIMP_PREVIEW (preview)->xmin; gint height = GIMP_PREVIEW (preview)->ymax - GIMP_PREVIEW (preview)->ymin; + gimp_scrolled_preview_freeze (preview); + GIMP_PREVIEW (preview)->width = MIN (width, allocation->width); GIMP_PREVIEW (preview)->height = MIN (height, allocation->height); @@ -359,8 +363,7 @@ gimp_scrolled_preview_area_size_allocate (GtkWidget *widget, gtk_widget_hide (preview->nav_icon); } - gimp_preview_draw (GIMP_PREVIEW (preview)); - gimp_preview_invalidate (GIMP_PREVIEW (preview)); + gimp_scrolled_preview_thaw (preview); } static gboolean @@ -777,6 +780,8 @@ gimp_scrolled_preview_set_position (GimpScrolledPreview *preview, g_return_if_fail (GIMP_IS_SCROLLED_PREVIEW (preview)); + gimp_scrolled_preview_freeze (preview); + gimp_scrolled_preview_hscr_update (preview); gimp_scrolled_preview_vscr_update (preview); @@ -785,6 +790,8 @@ gimp_scrolled_preview_set_position (GimpScrolledPreview *preview, adj = gtk_range_get_adjustment (GTK_RANGE (preview->vscr)); gtk_adjustment_set_value (adj, y - GIMP_PREVIEW (preview)->ymin); + + gimp_scrolled_preview_thaw (preview); } /**