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

popover: Simplify gtk_popover_measure

Browse Source
This commit is contained in:
Timm Bäder 2017-02-05 13:57:29 +01:00
parent 07643764a6
commit 78a36cf4bb
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkpopover.c
View File

@ -1272,9 +1272,10 @@ gtk_popover_measure (GtkWidget *widget,
if (child != NULL) if (child != NULL)
{ {
int child_size = -1;
if (for_size >= 0) if (for_size >= 0)
{ {
int child_size;
GdkRectangle child_rect; GdkRectangle child_rect;
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
@ -1287,14 +1288,9 @@ gtk_popover_measure (GtkWidget *widget,
gtk_popover_get_rect_for_size (popover, 0, for_size, &child_rect); gtk_popover_get_rect_for_size (popover, 0, for_size, &child_rect);
child_size = child_rect.height; child_size = child_rect.height;
} }
gtk_widget_measure (child, orientation, child_size, minimum, natural, NULL, NULL);
}
else
{
gtk_widget_measure (child, orientation, -1, minimum, natural, NULL, NULL);
} }
gtk_widget_measure (child, orientation, child_size, minimum, natural, NULL, NULL);
} }
minimal_size = get_minimal_size (popover, orientation); minimal_size = get_minimal_size (popover, orientation);