diff options
| author | Timm Bäder <mail@baedert.org> | 2017-03-04 08:18:36 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-03-04 08:44:49 +0100 |
| commit | 846e6dc0b1e531b90b6ad914b3fd0c2c2b989bc1 (patch) | |
| tree | 3246783439df7d8ee0514d5a5b528b23603ab05e /gtk/gtkmenuitem.c | |
| parent | b16a322c4c38bf9d7ef02586063375250f8ae7d1 (diff) | |
| download | gtk+-846e6dc0b1e531b90b6ad914b3fd0c2c2b989bc1.tar.gz | |
menus: Use gtk_widget_measure to measure widget sizes
Diffstat (limited to 'gtk/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 16a6e16b71..ab780fcf4b 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -444,7 +444,8 @@ gtk_menu_item_real_get_width (GtkWidget *widget, { gint child_min, child_nat; - gtk_widget_get_preferred_width (child, &child_min, &child_nat); + gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1, + &child_min, &child_nat, NULL, NULL); if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator) { @@ -511,14 +512,17 @@ gtk_menu_item_real_get_height (GtkWidget *widget, if (for_size != -1) { avail_size -= arrow_size; - gtk_widget_get_preferred_height_for_width (child, - avail_size, - &child_min, - &child_nat); + gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, + avail_size, + &child_min, &child_nat, + NULL, NULL); } else { - gtk_widget_get_preferred_height (child, &child_min, &child_nat); + gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, -1, + &child_min, &child_nat, + NULL, NULL); + } min_height += child_min; |