mirror of https://github.com/GNOME/gimp.git
formatting.
2007-09-21 Sven Neumann <sven@gimp.org> * 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
This commit is contained in:
parent
accb626859
commit
24c7fc1e8d
|
@ -1,3 +1,10 @@
|
||||||
|
2007-09-21 Sven Neumann <sven@gimp.org>
|
||||||
|
|
||||||
|
* 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 <sven@gimp.org>
|
2007-09-21 Sven Neumann <sven@gimp.org>
|
||||||
|
|
||||||
* app/file/file-open.c (file_open_image): set the image clean
|
* app/file/file-open.c (file_open_image): set the image clean
|
||||||
|
|
|
@ -273,7 +273,7 @@ gimp_preview_init (GimpPreview *preview)
|
||||||
GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
|
GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
|
||||||
gtk_widget_show (priv->controls);
|
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"));
|
preview->toggle = gtk_check_button_new_with_mnemonic (_("_Preview"));
|
||||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview->toggle),
|
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preview->toggle),
|
||||||
preview->update_preview);
|
preview->update_preview);
|
||||||
|
@ -471,8 +471,7 @@ gimp_preview_invalidate_now (GimpPreview *preview)
|
||||||
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (preview));
|
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (preview));
|
||||||
GimpPreviewClass *class = GIMP_PREVIEW_GET_CLASS (preview);
|
GimpPreviewClass *class = GIMP_PREVIEW_GET_CLASS (preview);
|
||||||
|
|
||||||
if (class->draw)
|
gimp_preview_draw (preview);
|
||||||
class->draw (preview);
|
|
||||||
|
|
||||||
preview->timeout_id = 0;
|
preview->timeout_id = 0;
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ gimp_scrolled_preview_init (GimpScrolledPreview *preview)
|
||||||
priv->vscr_policy = GTK_POLICY_AUTOMATIC;
|
priv->vscr_policy = GTK_POLICY_AUTOMATIC;
|
||||||
|
|
||||||
priv->in_drag = FALSE;
|
priv->in_drag = FALSE;
|
||||||
priv->frozen = 0;
|
priv->frozen = 1; /* we are frozen during init */
|
||||||
|
|
||||||
/* scrollbars */
|
/* scrollbars */
|
||||||
adj = gtk_adjustment_new (0, 0, GIMP_PREVIEW (preview)->width - 1, 1.0,
|
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_signal_connect (preview->nav_icon, "button-press-event",
|
||||||
G_CALLBACK (gimp_scrolled_preview_nav_button_press),
|
G_CALLBACK (gimp_scrolled_preview_nav_button_press),
|
||||||
preview);
|
preview);
|
||||||
|
|
||||||
|
priv->frozen = 0; /* thaw without actually calling draw/invalidate */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
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 width = GIMP_PREVIEW (preview)->xmax - GIMP_PREVIEW (preview)->xmin;
|
||||||
gint height = GIMP_PREVIEW (preview)->ymax - GIMP_PREVIEW (preview)->ymin;
|
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)->width = MIN (width, allocation->width);
|
||||||
GIMP_PREVIEW (preview)->height = MIN (height, allocation->height);
|
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);
|
gtk_widget_hide (preview->nav_icon);
|
||||||
}
|
}
|
||||||
|
|
||||||
gimp_preview_draw (GIMP_PREVIEW (preview));
|
gimp_scrolled_preview_thaw (preview);
|
||||||
gimp_preview_invalidate (GIMP_PREVIEW (preview));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
|
@ -777,6 +780,8 @@ gimp_scrolled_preview_set_position (GimpScrolledPreview *preview,
|
||||||
|
|
||||||
g_return_if_fail (GIMP_IS_SCROLLED_PREVIEW (preview));
|
g_return_if_fail (GIMP_IS_SCROLLED_PREVIEW (preview));
|
||||||
|
|
||||||
|
gimp_scrolled_preview_freeze (preview);
|
||||||
|
|
||||||
gimp_scrolled_preview_hscr_update (preview);
|
gimp_scrolled_preview_hscr_update (preview);
|
||||||
gimp_scrolled_preview_vscr_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));
|
adj = gtk_range_get_adjustment (GTK_RANGE (preview->vscr));
|
||||||
gtk_adjustment_set_value (adj, y - GIMP_PREVIEW (preview)->ymin);
|
gtk_adjustment_set_value (adj, y - GIMP_PREVIEW (preview)->ymin);
|
||||||
|
|
||||||
|
gimp_scrolled_preview_thaw (preview);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue