view.c: enable deco on xdg-shell views

diff --git a/include/labwc.h b/include/labwc.h
index bf591710940905ed3b62e501a4033eb09e2d17d4..557e7421ea130f3646d671f90b52e1763cf331ff 100644 (file)
--- 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 22de34657c6f27497d42794233d7aec154d8d416..d11cb204164c24288a192f2767cd10a55571056d 100644 (file)
--- 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 !=