diff options
| author | Earnestly | 2016-04-04 23:07:58 +0100 |
|---|---|---|
| committer | Earnestly | 2016-04-04 23:07:58 +0100 |
| commit | 0a1fbd382362648bef84e44e81854c7c9b4f5b7a (patch) | |
| tree | d567f5eed3c0f8384b2b16190f50e12e7eaa617b /gtk3-make-csd-optional.patch | |
| parent | a2514efed6ac133b09350f7b0f0b379cdabb502c (diff) | |
| download | aur-0a1fbd382362648bef84e44e81854c7c9b4f5b7a.tar.gz | |
gtk3-optional-csd: update patch for 3.20.2
Diffstat (limited to 'gtk3-make-csd-optional.patch')
| -rw-r--r-- | gtk3-make-csd-optional.patch | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/gtk3-make-csd-optional.patch b/gtk3-make-csd-optional.patch index a5694580bad4..2275259a13b0 100644 --- a/gtk3-make-csd-optional.patch +++ b/gtk3-make-csd-optional.patch @@ -1,20 +1,20 @@ -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index 53f74e8..37d7aa8 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c -@@ -5771,30 +5771,12 @@ gtk_window_should_use_csd (GtkWindow *window) +@@ -6025,9 +6025,6 @@ GtkWindowPrivate *priv = window->priv; const gchar *csd_env; - + - if (priv->csd_requested) - return TRUE; - if (!priv->decorated) return FALSE; - - if (priv->type == GTK_WINDOW_POPUP) + +@@ -6035,28 +6032,6 @@ return FALSE; - + + csd_env = g_getenv ("GTK_CSD"); +- -#ifdef GDK_WINDOWING_BROADWAY - if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) - return TRUE; @@ -30,6 +30,12 @@ index 53f74e8..37d7aa8 100644 - return TRUE; -#endif - - csd_env = g_getenv ("GTK_CSD"); - +-#ifdef GDK_WINDOWING_WIN32 +- if (g_strcmp0 (csd_env, "0") != 0 && +- GDK_IS_WIN32_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) +- return TRUE; +-#endif +- return (g_strcmp0 (csd_env, "1") == 0); + } + |