AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-03 17:21:11 +00:00
Code Issues Projects Releases Wiki Activity

overlay: Ensure proper child widget order

Browse Source 
Make sure the main widget stays below all the overlay children.
This commit is contained in:
Timm Bäder 2017-04-23 08:39:15 +02:00
parent 9644bea2a5
commit ae1a606c8b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkoverlay.c
View File

@ -587,9 +587,10 @@ gtk_overlay_reorder_overlay (GtkOverlay *overlay,
gtk_widget_child_notify (info->widget, "index");
}
if (gtk_widget_get_visible (child) &&
gtk_widget_get_visible (GTK_WIDGET (overlay)))
gtk_widget_queue_resize (GTK_WIDGET (overlay));
if (new_link)
gtk_widget_insert_before (child, GTK_WIDGET (overlay), ((GtkOverlayChild *)new_link->data)->widget);
else
gtk_widget_insert_before (child, GTK_WIDGET (overlay), NULL);
}
@ -832,7 +833,11 @@ gtk_overlay_buildable_add_child (GtkBuildable *buildable,
if (type && strcmp (type, "overlay") == 0)
gtk_overlay_add_overlay (GTK_OVERLAY (buildable), GTK_WIDGET (child));
else if (!type)
gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child));
{
/* Make sure the main-child node is the first one */
gtk_widget_insert_after (GTK_WIDGET (child), GTK_WIDGET (buildable), NULL);
_gtk_bin_set_child (GTK_BIN (buildable), GTK_WIDGET (child));
}
else
GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type);
}
@ -890,12 +895,9 @@ gtk_overlay_add_overlay (GtkOverlay *overlay,
priv->children = g_slist_append (priv->children, child);
if (gtk_widget_get_realized (GTK_WIDGET (overlay)))
{
child->window = gtk_overlay_create_child_window (overlay, child);
gtk_widget_set_parent (widget, GTK_WIDGET (overlay));
}
else
gtk_widget_set_parent (widget, GTK_WIDGET (overlay));
child->window = gtk_overlay_create_child_window (overlay, child);
gtk_widget_insert_before (widget, GTK_WIDGET (overlay), NULL);
gtk_widget_child_notify (widget, "index");
}