Merge pull request #109 from 01micko/cage-bugfix3

Mick Amadio · web-flow · commit 100afa6e7184 · 2021-12-13T05:49:15.000+10:00
widget_window.c: fix cage/X bug closes #106
diff --git a/src/widget_window.c b/src/widget_window.c
@@ -98,6 +98,9 @@ GtkWidget *widget_window_create(
 	widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);  
 
 #if HAVE_GTK_LAYER_SHELL
+	if (getenv("GDK_BACKEND") && strcmp(getenv("GDK_BACKEND"), "wayland") != 0)
+		goto layer_set;
+
 	GtkLayerShellLayer layer = GTK_LAYER_SHELL_LAYER_ENTRY_NUMBER;
 
 	value = get_tag_attribute(attr, "layer");
@@ -167,6 +170,7 @@ GtkWidget *widget_window_create(
 		}
 	}
 
+layer_set:
 #endif
 
 	/* Set a default window title */

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ GtkWidget *widget_window_create(`
`98`	`98`	`widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);`
`99`	`99`
`100`	`100`	`#if HAVE_GTK_LAYER_SHELL`
	`101`	`+ if (getenv("GDK_BACKEND") && strcmp(getenv("GDK_BACKEND"), "wayland") != 0)`
	`102`	`+ goto layer_set;`
	`103`	`+`
`101`	`104`	`GtkLayerShellLayer layer = GTK_LAYER_SHELL_LAYER_ENTRY_NUMBER;`
`102`	`105`
`103`	`106`	`value = get_tag_attribute(attr, "layer");`
`@@ -167,6 +170,7 @@ GtkWidget *widget_window_create(`
`167`	`170`	`}`
`168`	`171`	`}`
`169`	`172`
	`173`	`+layer_set:`
`170`	`174`	`#endif`
`171`	`175`
`172`	`176`	`/* Set a default window title */`