From: Johan Malm <jgm323@gmail.com>
Date: Mon, 1 Jun 2020 06:07:09 +0000 (+0100)
Subject: view.c: enable deco on xdg-shell views
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=bcdd553477b3d608875d94965c961180f2a66993;p=proto%2Flabwc.git

view.c: enable deco on xdg-shell views
---

diff --git a/include/labwc.h b/include/labwc.h
index bf591710..557e7421 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -34,7 +34,7 @@
 #define XCURSOR_MOVE "grabbing"
 #define XWL_TITLEBAR_HEIGHT (10)
 #define XWL_WINDOW_BORDER (3)
-#define LAB_DISABLE_CSD (0)
+#define LAB_DISABLE_CSD (1)
 
 enum cursor_mode {
 	LAB_CURSOR_PASSTHROUGH,
diff --git a/src/view.c b/src/view.c
index 22de3465..d11cb204 100644
--- a/src/view.c
+++ b/src/view.c
@@ -59,10 +59,12 @@ static bool is_toplevel(struct view *view)
 
 bool view_want_deco(struct view *view)
 {
-	if (view->type != LAB_XWAYLAND_VIEW)
-		return false;
 	if (!is_toplevel(view))
 		return false;
+	if (view->type == LAB_XDG_SHELL_VIEW && !LAB_DISABLE_CSD)
+		return false;
+	if (view->type == LAB_XDG_SHELL_VIEW)
+		return true;
 	if (view->xwayland_surface->override_redirect)
 		return false;
 	if (view->xwayland_surface->decorations !=