forked from lah7/gtk3-classic
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow CSD to be disabled on non-GNOME Wayland sessions
- Loading branch information
Showing
5 changed files
with
42 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,27 @@ | ||
| diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c | ||
| --- ./org/gtk/gtkwindow.c 2018-01-15 14:21:38.000000000 +0100 | ||
| +++ ./mod/gtk/gtkwindow.c 2018-05-29 10:39:33.013711354 +0200 | ||
| @@ -4151,10 +4151,18 @@ | ||
| --- ./org/gtk/gtkwindow.c 2019-09-03 21:53:07.000000000 +0300 | ||
| +++ ./mod/gtk/gtkwindow.c 2019-12-29 16:24:09.937549137 +0200 | ||
| @@ -4160,10 +4160,22 @@ | ||
| { | ||
| gtk_style_context_add_class (gtk_widget_get_style_context (widget), "solid-csd"); | ||
| } | ||
|
|
||
| priv->client_decorated = TRUE; | ||
| + | ||
| + gboolean is_gnome_wayland = g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome") == 0; | ||
| +#ifdef GDK_WINDOWING_X11 | ||
| + if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)) && g_getenv("GTK_CSD") == FALSE) | ||
| + is_gnome_wayland = is_gnome_wayland && !GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget)); | ||
| +#endif | ||
| + | ||
| + if (!is_gnome_wayland && g_getenv("GTK_CSD") == FALSE) | ||
| + { | ||
| + gtk_style_context_remove_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_CSD); | ||
| + gtk_style_context_remove_class (gtk_widget_get_style_context (widget), "solid-csd"); | ||
| + priv->client_decorated = FALSE; | ||
| + } | ||
| +#endif | ||
| } | ||
|
|
||
| static void | ||
| on_titlebar_title_notify (GtkHeaderBar *titlebar, | ||
| GParamSpec *pspec, | ||
| Only in ./mod/gtk: gtkwindow.c.orig |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,23 @@ | ||
| diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c | ||
| --- ./org/gtk/gtkwindow.c 2018-01-15 14:21:38.000000000 +0100 | ||
| +++ ./mod/gtk/gtkwindow.c 2018-05-30 01:00:23.948990000 +0200 | ||
| @@ -4100,10 +4100,12 @@ | ||
| --- ./org/gtk/gtkwindow.c 2019-09-03 21:53:07.000000000 +0300 | ||
| +++ ./mod/gtk/gtkwindow.c 2019-12-29 16:29:21.159036758 +0200 | ||
| @@ -4106,10 +4106,18 @@ | ||
| GdkVisual *visual; | ||
|
|
||
| screen = _gtk_window_get_screen (window); | ||
| display = gdk_screen_get_display (screen); | ||
|
|
||
|
|
||
| + gboolean is_gnome_wayland = g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome") == 0; | ||
| +#ifdef GDK_WINDOWING_X11 | ||
| + is_gnome_wayland = is_gnome_wayland && !GDK_IS_X11_DISPLAY (display); | ||
| +#endif | ||
| + | ||
| + if (!is_gnome_wayland && g_strcmp0 (g_getenv ("GTK_CSD"), "1") != 0) | ||
| + return FALSE; | ||
| + | ||
| #ifdef GDK_WINDOWING_X11 | ||
| if (GDK_IS_X11_DISPLAY (display)) | ||
| { | ||
| + if (g_strcmp0 (g_getenv ("GTK_CSD"), "1") != 0) | ||
| + return FALSE; | ||
| if (!gdk_screen_is_composited (screen)) | ||
| return FALSE; | ||
|
|
||
| if (!gdk_x11_screen_supports_net_wm_hint (screen, gdk_atom_intern_static_string ("_GTK_FRAME_EXTENTS"))) | ||
| return FALSE; | ||
| Only in ./mod/gtk: gtkwindow.c.orig |