callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stack: Scope some variables so that the code is clearer

Browse Source 
... that the allocation magic here is for the transition of the
last visible child that's sliding out.
This commit is contained in:
Jasper St. Pierre
2013-11-01 01:49:29 -04:00
parent 499b4bb60f
commit 3e836dd9fc
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
gtk/gtkstack.c
View File

@ -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);
x = get_bin_window_x (stack, &allocation);
y = get_bin_window_y (stack, &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;
}
if (priv->last_visible_surface &&
gtk_cairo_should_draw_window (cr, priv->view_window))
{
GtkAllocation allocation;
int x, y;
gtk_widget_get_allocation (widget, &allocation);
x = get_bin_window_x (stack, &allocation);
y = get_bin_window_y (stack, &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;
}
cairo_save (cr);
cairo_set_source_surface (cr, priv->last_visible_surface, x, y);
cairo_paint (cr);