From 0f18e907345838c0eeba7630e1bbb3a138147c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 7 May 2015 23:06:32 +0800
Subject: [PATCH] GtkWindow: Manually set CSD should enable shadow width
 calculation

If CSD is enabled with shadow even though it "shouldn't"*, the width
should still be calculated correctly. This fixes a regression caused by
b1e5ad469c753ea3eed967056ca814ecb0117c7b.

* gtk_window_should_use_csd () returns false

https://bugzilla.gnome.org/show_bug.cgi?id=748615
---
 gtk/gtkwindow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0751194c25..87e1b26f42 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6481,7 +6481,7 @@ get_shadow_width (GtkWidget *widget,
   *shadow_width = border;
 
   if (!priv->decorated ||
-      !gtk_window_should_use_csd (window) ||
+      (!gtk_window_should_use_csd (window) && !priv->client_decorated) ||
       !gtk_window_supports_client_shadow (window))
     return;