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

window: Properly detect if size allocation is needed

Browse Source 
Instead of looking at the allocation, just look at the alloc_needed
widget flag that tracks if an allocation is needed.
This commit is contained in:
Benjamin Otte 2019-02-12 02:20:36 +01:00
parent 07722582ef
commit 2ba928e142
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwindow.c
View File

@ -6385,13 +6385,8 @@ gtk_window_realize (GtkWidget *widget)
if (!priv->client_decorated && gtk_window_should_use_csd (window)) if (!priv->client_decorated && gtk_window_should_use_csd (window))
create_decoration (widget); create_decoration (widget);
_gtk_widget_get_allocation (widget, &allocation);
/* ensure widget tree is properly size allocated */ /* ensure widget tree is properly size allocated */
if (allocation.x == -1 && if (_gtk_widget_get_alloc_needed (widget))
allocation.y == -1 &&
allocation.width == 1 &&
allocation.height == 1)
{ {
GdkRectangle request; GdkRectangle request;
@ -6408,16 +6403,15 @@ gtk_window_realize (GtkWidget *widget)
g_return_if_fail (!_gtk_widget_get_realized (widget)); g_return_if_fail (!_gtk_widget_get_realized (widget));
} }
_gtk_widget_get_allocation (widget, &allocation);
if (priv->hardcoded_surface) if (priv->hardcoded_surface)
{ {
surface = priv->hardcoded_surface; surface = priv->hardcoded_surface;
_gtk_widget_get_allocation (widget, &allocation);
gdk_surface_resize (surface, allocation.width, allocation.height); gdk_surface_resize (surface, allocation.width, allocation.height);
} }
else else
{ {
_gtk_widget_get_allocation (widget, &allocation);
switch (priv->type) switch (priv->type)
{ {
case GTK_WINDOW_TOPLEVEL: case GTK_WINDOW_TOPLEVEL: