From 35aec354d7812b1e2af546e1e08861bfdd7d9ce0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 29 Apr 2014 19:26:06 +0200 Subject: [PATCH] window: Subtract shadow from passed in width for height ... and height for width in size requests. Fixes mislayout in control-center universal access panel. --- gtk/gtkwindow.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index bd060c3a1f..72c1d35e5f 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8405,6 +8405,8 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget, { get_shadow_width (widget, &window_border); + height -= window_border.top + window_border.bottom; + if (priv->title_box != NULL && gtk_widget_get_visible (priv->title_box) && gtk_widget_get_child_visible (priv->title_box)) @@ -8515,6 +8517,8 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget, { get_shadow_width (widget, &window_border); + width -= window_border.left + window_border.right; + if (priv->title_box != NULL && gtk_widget_get_visible (priv->title_box) && gtk_widget_get_child_visible (priv->title_box))