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

Revert "Revealer: Don’t (under)allocate child if not shown"

Browse Source 
This reverts commit d179b0667d.

This broke the downloads popover in Epiphany. See #1057.
This commit is contained in:
Michael Catanzaro
2019-01-07 18:20:01 -06:00
parent 105dd5eda0
commit 65311c8439
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkrevealer.c
View File

@ -449,7 +449,7 @@ gtk_revealer_real_size_allocate (GtkWidget *widget,
GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer); GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer);
GtkAllocation child_allocation; GtkAllocation child_allocation;
GtkWidget *child; GtkWidget *child;
gboolean child_visible, window_visible; gboolean window_visible;
int bin_x, bin_y; int bin_x, bin_y;
GtkRevealerTransitionType transition; GtkRevealerTransitionType transition;
GtkBorder padding; GtkBorder padding;
@ -460,9 +460,7 @@ gtk_revealer_real_size_allocate (GtkWidget *widget,
gtk_revealer_get_child_allocation (revealer, allocation, &child_allocation); gtk_revealer_get_child_allocation (revealer, allocation, &child_allocation);
child = gtk_bin_get_child (GTK_BIN (revealer)); child = gtk_bin_get_child (GTK_BIN (revealer));
child_visible = child != NULL && gtk_widget_get_visible (child) && if (child != NULL && gtk_widget_get_visible (child))
gtk_widget_get_child_visible (child);
if (child_visible)
gtk_widget_size_allocate (child, &child_allocation); gtk_widget_size_allocate (child, &child_allocation);
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))