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

Revert "gtkoverlay: Optimize size allocations"

Browse Source 
This reverts commit 93171cf4f3.

This broke overlay controls in page 3 of widget-factory, gnome-photos,
gnome-documents, etc.
This commit is contained in:
Matthias Clasen 2015-08-22 11:22:27 -04:00
parent 1d2ff9a069
commit 2bf97567ce
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkoverlay.c
View File

@ -295,8 +295,11 @@ gtk_overlay_child_allocate (GtkOverlay *overlay,
if (gtk_widget_get_mapped (GTK_WIDGET (overlay))) if (gtk_widget_get_mapped (GTK_WIDGET (overlay)))
{ {
/* Note: This calls show every size allocation, which makes
* us keep the z-order of the chilren, as gdk_window_show()
* does an implicit raise. */
if (gtk_widget_get_visible (child->widget)) if (gtk_widget_get_visible (child->widget))
gdk_window_show_unraised (child->window); gdk_window_show (child->window);
else if (gdk_window_is_visible (child->window)) else if (gdk_window_is_visible (child->window))
gdk_window_hide (child->window); gdk_window_hide (child->window);
} }
@ -580,16 +583,6 @@ gtk_overlay_reorder_overlay (GtkOverlay *overlay,
if (index == old_index) if (index == old_index)
return; return;
if (new_link)
{
GtkOverlayChild *new_child_info = new_link->data;
gdk_window_restack (child_info->window, new_child_info->window, TRUE);
}
else
{
gdk_window_raise (child_info->window);
}
priv->children = g_slist_delete_link (priv->children, old_link); priv->children = g_slist_delete_link (priv->children, old_link);
priv->children = g_slist_insert_before (priv->children, new_link, child_info); priv->children = g_slist_insert_before (priv->children, new_link, child_info);