summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-04-24 11:07:20 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-04-24 11:07:20 -0400
commit1c1c030b8e6a9da8628197592d33c0f547fde293 (patch)
treee0eb5ae2c0af6fed5886fe0b19aab084825a0bb9
parent628d5406d72cf29d678f20a56a51e1871a1af221 (diff)
downloadgtk+-1c1c030b8e6a9da8628197592d33c0f547fde293.tar.gz
Simplify shadow conditions
The code in gtkwindow.c for dealing with the various combinations of client-side decorations and client-side shadows is entirely too complicated. This commit does not really clean it up, but simplifies one of the shadow conditions far enough to make some sense. With this change, I get the expected decorations in all the cases I can easily reproduce locally.
-rw-r--r--gtk/gtkwindow.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a21e7205c8..88a4e9721a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4005,9 +4005,8 @@ get_shadow_width (GtkWindow *window,
if (!priv->decorated)
goto out;
- if (!priv->client_decorated &&
- !(gtk_window_should_use_csd (window) &&
- gtk_window_supports_client_shadow (window)))
+ if (!priv->client_decorated ||
+ !priv->use_client_shadow)
goto out;
if (priv->maximized ||