AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

applicationwindow: Fix issues with measure vfunc transition

Browse Source
This commit is contained in:
Benjamin Otte 2016-10-26 17:59:33 +02:00
parent a750f942ac
commit 75358e4d8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkapplicationwindow.c
View File

@ -552,7 +552,7 @@ gtk_application_window_measure (GtkWidget *widget,
GtkBorder border = {0};
int menubar_height = 0;
gtk_widget_get_preferred_height_for_width (priv->menubar, for_size, &menubar_height, NULL);
gtk_widget_measure (priv->menubar, orientation, for_size, &menubar_height, NULL, NULL, NULL);
GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget,
orientation,
@ -561,7 +561,7 @@ gtk_application_window_measure (GtkWidget *widget,
minimum_baseline, natural_baseline);
gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min, &menubar_nat);
gtk_widget_measure (window->priv->menubar, orientation, menubar_height, &menubar_min, &menubar_nat, NULL, NULL);
_gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
menubar_min += border.left + border.right;
@ -579,7 +579,7 @@ gtk_application_window_measure (GtkWidget *widget,
minimum, natural,
minimum_baseline, natural_baseline);
gtk_widget_get_preferred_height_for_width (priv->menubar, for_size, &menubar_min, &menubar_nat);
gtk_widget_measure (priv->menubar, orientation, for_size, &menubar_min, &menubar_nat, NULL, NULL);
*minimum += menubar_min;
*natural += menubar_nat;
}