From e45cb3340c5b1682b8d960431d262dd873da6194 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 26 Feb 2016 06:49:35 +0100 Subject: [PATCH] window: Include decoration border and padding in resize area This is relevant for the Windows theme, which is the only theme that uses padding on decorations. All other themes are unaffected. --- gtk/gtkwindow.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 12ad040334..a5b9a27e28 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6758,7 +6758,7 @@ update_border_windows (GtkWindow *window) cairo_region_t *region; cairo_rectangle_int_t rect; gint width, height; - GtkBorder border; + GtkBorder border, tmp; GtkBorder window_border; GtkStyleContext *context; @@ -6769,6 +6769,10 @@ update_border_windows (GtkWindow *window) gtk_style_context_save_to_node (context, priv->decoration_node); gtk_style_context_get_margin (context, gtk_style_context_get_state (context), &border); + gtk_style_context_get_border (context, gtk_style_context_get_state (context), &tmp); + sum_borders (&border, &tmp); + gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &tmp); + sum_borders (&border, &tmp); gtk_widget_style_get (widget, "decoration-resize-handle", &handle, NULL);