summaryrefslogtreecommitdiff
path: root/gtk/gtkactionbar.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-01-06 23:33:39 -0500
committerWilliam Jon McCann <william.jon.mccann@gmail.com>2014-01-07 08:46:37 -0500
commitb39f094b21c51c44f702f7337ee191054ef54e95 (patch)
treeaf94e7b991feb2ed9ec5be0804d5169f7d8d65f3 /gtk/gtkactionbar.c
parent51d462e927b3fe0b3aa1e0bd9ace17b750c7dd81 (diff)
downloadgtk+-b39f094b21c51c44f702f7337ee191054ef54e95.tar.gz
Fix order of pack-end widgets
https://bugzilla.gnome.org/show_bug.cgi?id=721665
Diffstat (limited to 'gtk/gtkactionbar.c')
-rw-r--r--gtk/gtkactionbar.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index 02d3cdf838..527a04cbec 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -509,18 +509,9 @@ gtk_action_bar_size_allocate (GtkWidget *widget,
else
x = allocation->x + allocation->width - end_width - css_borders.right;
- if (packing == GTK_PACK_START)
- {
- l = priv->children;
- i = 0;
- }
- else
- {
- l = g_list_last (priv->children);
- i = nvis_children - 1;
- }
+ i = 0;
- for (; l != NULL; (packing == GTK_PACK_START) ? (l = l->next) : (l = l->prev))
+ for (l = priv->children; l != NULL; l = l->next)
{
child = l->data;
if (!gtk_widget_get_visible (child->widget))
@@ -554,10 +545,7 @@ gtk_action_bar_size_allocate (GtkWidget *widget,
gtk_widget_size_allocate (child->widget, &child_allocation);
next:
- if (packing == GTK_PACK_START)
- i++;
- else
- i--;
+ i++;
}
}