[gtk+] stack: Scope some variables so that the code is clearer
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] stack: Scope some variables so that the code is clearer
- Date: Fri, 1 Nov 2013 05:53:54 +0000 (UTC)
commit 3e836dd9fc2bd12c3da432bfce9fa132ce2ff56c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Nov 1 01:49:29 2013 -0400
stack: Scope some variables so that the code is clearer
... that the allocation magic here is for the transition of the
last visible child that's sliding out.
gtk/gtkstack.c | 69 +++++++++++++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 35 deletions(-)
---
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index fd3ac8f..5351eb3 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -1573,46 +1573,45 @@ gtk_stack_draw_slide (GtkWidget *widget,
{
GtkStack *stack = GTK_STACK (widget);
GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
- GtkAllocation allocation;
- gint x = 0;
- gint y = 0;
- gtk_widget_get_allocation (widget, &allocation);
+ if (priv->last_visible_surface &&
+ gtk_cairo_should_draw_window (cr, priv->view_window))
+ {
+ GtkAllocation allocation;
+ int x, y;
- x = get_bin_window_x (stack, &allocation);
- y = get_bin_window_y (stack, &allocation);
+ gtk_widget_get_allocation (widget, &allocation);
- switch (priv->active_transition_type)
- {
- case GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT:
- x -= allocation.width;
- break;
- case GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT:
- x += allocation.width;
- break;
- case GTK_STACK_TRANSITION_TYPE_SLIDE_UP:
- y -= allocation.height;
- break;
- case GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN:
- y += allocation.height;
- break;
- case GTK_STACK_TRANSITION_TYPE_OVER_UP:
- case GTK_STACK_TRANSITION_TYPE_OVER_DOWN:
- y = 0;
- break;
- case GTK_STACK_TRANSITION_TYPE_OVER_LEFT:
- case GTK_STACK_TRANSITION_TYPE_OVER_RIGHT:
- x = 0;
- break;
- default:
- g_assert_not_reached ();
- break;
- }
+ x = get_bin_window_x (stack, &allocation);
+ y = get_bin_window_y (stack, &allocation);
- if (priv->last_visible_surface &&
- gtk_cairo_should_draw_window (cr, priv->view_window))
+ switch (priv->active_transition_type)
+ {
+ case GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT:
+ x -= allocation.width;
+ break;
+ case GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT:
+ x += allocation.width;
+ break;
+ case GTK_STACK_TRANSITION_TYPE_SLIDE_UP:
+ y -= allocation.height;
+ break;
+ case GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN:
+ y += allocation.height;
+ break;
+ case GTK_STACK_TRANSITION_TYPE_OVER_UP:
+ case GTK_STACK_TRANSITION_TYPE_OVER_DOWN:
+ y = 0;
+ break;
+ case GTK_STACK_TRANSITION_TYPE_OVER_LEFT:
+ case GTK_STACK_TRANSITION_TYPE_OVER_RIGHT:
+ x = 0;
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
- {
cairo_save (cr);
cairo_set_source_surface (cr, priv->last_visible_surface, x, y);
cairo_paint (cr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]