mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-21 06:20:29 +00:00
applicationwindow: Fix issues with measure vfunc transition
This commit is contained in:
parent
a750f942ac
commit
75358e4d8d
@ -552,7 +552,7 @@ gtk_application_window_measure (GtkWidget *widget,
|
|||||||
GtkBorder border = {0};
|
GtkBorder border = {0};
|
||||||
int menubar_height = 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,
|
GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget,
|
||||||
orientation,
|
orientation,
|
||||||
@ -561,7 +561,7 @@ gtk_application_window_measure (GtkWidget *widget,
|
|||||||
minimum_baseline, natural_baseline);
|
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);
|
_gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
|
||||||
menubar_min += border.left + border.right;
|
menubar_min += border.left + border.right;
|
||||||
@ -579,7 +579,7 @@ gtk_application_window_measure (GtkWidget *widget,
|
|||||||
minimum, natural,
|
minimum, natural,
|
||||||
minimum_baseline, natural_baseline);
|
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;
|
*minimum += menubar_min;
|
||||||
*natural += menubar_nat;
|
*natural += menubar_nat;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user