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

widget: Use gtk_widget_measure to measure widget sizes

Browse Source
This commit is contained in:
Timm Bäder 2016-12-05 18:19:04 +01:00
parent 07a9b202ab
commit ea22bd9d40
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwidget.c
View File

@ -5402,8 +5402,10 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
* of get_height_for_width will internally limit the for_size to natural size * of get_height_for_width will internally limit the for_size to natural size
* when aligning implicitly. * when aligning implicitly.
*/ */
gtk_widget_get_preferred_width (widget, &min_width, &natural_width); gtk_widget_measure (widget, GTK_ORIENTATION_HORIZONTAL, -1,
gtk_widget_get_preferred_height_for_width (widget, real_allocation.width, &min_height, &natural_height); &min_width, &natural_width, NULL, NULL);
gtk_widget_measure (widget, GTK_ORIENTATION_VERTICAL, real_allocation.width,
&min_height, &natural_height, NULL, NULL);
} }
else else
{ {
@ -5411,8 +5413,10 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
* of get_width_for_height will internally limit the for_size to natural size * of get_width_for_height will internally limit the for_size to natural size
* when aligning implicitly. * when aligning implicitly.
*/ */
gtk_widget_get_preferred_height (widget, &min_height, &natural_height); gtk_widget_measure (widget, GTK_ORIENTATION_VERTICAL, -1,
gtk_widget_get_preferred_width_for_height (widget, real_allocation.height, &min_width, &natural_width); &min_height, &natural_height, NULL, NULL);
gtk_widget_measure (widget, GTK_ORIENTATION_HORIZONTAL, real_allocation.height,
&min_width, &natural_width, NULL, NULL);
} }
#ifdef G_ENABLE_CONSISTENCY_CHECKS #ifdef G_ENABLE_CONSISTENCY_CHECKS