AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkBox: make get_path_for_child() work if there are internal children

Browse Source 
Use foreach() instead of forall() to find the child's siblings
because internal children of subclasses have no sibling relation
to the box' children. Also deal with the subclass failing to
implement get_path_for_child(). This caused an infinite widget
path invalidation loop of sorts with GimpMessageBox, which is a
vertical box with a decorative icon to the left.
This commit is contained in:
Michael Natterer 2011-09-26 00:46:16 +02:00
parent 66becfdab1
commit a6151ebb95
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkbox.c
View File

@ -861,18 +861,24 @@ count_widget_position (GtkWidget *widget,
count->before++; count->before++;
} }
static guint static gint
gtk_box_get_visible_position (GtkBox *box, gtk_box_get_visible_position (GtkBox *box,
GtkWidget *child) GtkWidget *child)
{ {
CountingData count = { child, FALSE, 0, 0 }; CountingData count = { child, FALSE, 0, 0 };
/* forall iterates in visible order */ /* foreach iterates in visible order */
gtk_container_forall (GTK_CONTAINER (box), gtk_container_foreach (GTK_CONTAINER (box),
count_widget_position, count_widget_position,
&count); &count);
/* the child wasn't found, it's likely an internal child of some
* subclass, return -1 to indicate that there is no sibling relation
* to the regular box children
*/
if (!count.found)
return -1;
g_assert (count.found);
if (box->priv->orientation == GTK_ORIENTATION_HORIZONTAL && if (box->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL) gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
return count.after; return count.after;
@ -896,6 +902,8 @@ gtk_box_get_path_for_child (GtkContainer *container,
if (gtk_widget_get_visible (child)) if (gtk_widget_get_visible (child))
{ {
gint position;
sibling_path = gtk_widget_path_new (); sibling_path = gtk_widget_path_new ();
/* get_children works in visible order */ /* get_children works in visible order */
@ -911,13 +919,17 @@ gtk_box_get_path_for_child (GtkContainer *container,
gtk_widget_path_append_for_widget (sibling_path, list->data); gtk_widget_path_append_for_widget (sibling_path, list->data);
} }
g_list_free (children);
gtk_widget_path_append_with_siblings (path, g_list_free (children);
sibling_path,
gtk_box_get_visible_position (box, position = gtk_box_get_visible_position (box, child);
child));
gtk_widget_path_unref (sibling_path); if (position >= 0)
gtk_widget_path_append_with_siblings (path, sibling_path, position);
else
gtk_widget_path_append_for_widget (path, child);
gtk_widget_path_unref (sibling_path);
} }
else else
gtk_widget_path_append_for_widget (path, child); gtk_widget_path_append_for_widget (path, child);