view: Hide decorations for fullscreen views

Otherwise the decorations are visible on adjacent outputs.

diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c
index 76c6a2b7d28355e649d0ab5e1fb6a206658b3e39..adf86c07bb9483cf970cd363193b9790c4d88f14 100644 (file)
--- a/src/ssd/ssd.c
+++ b/src/ssd/ssd.c
@@ -16,7 +16,11 @@
 struct border
 ssd_thickness(struct view *view)
 {
-       if (!view->ssd_enabled) {
+       /*
+        * Check preconditions for displaying SSD. Note that this
+        * needs to work even before ssd_create() has been called.
+        */
+       if (!view->ssd_enabled || view->fullscreen) {
                return (struct border){ 0 };
        }
        struct theme *theme = view->server->theme;

diff --git a/src/view.c b/src/view.c
index d9d7f10f3db04245cbea51a88addd771181bc9e9..d5d4834e7ff92f7e273469466e14903c09fc050d 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -605,10 +605,15 @@ view_set_fullscreen(struct view *view, bool fullscreen,
                if (!view->maximized && !view->tiled) {
                        view_store_natural_geometry(view);
                }
+               /* Hide decorations when going fullscreen */
+               if (view->ssd_enabled) {
+                       ssd_destroy(view);
+               }
                view->fullscreen = wlr_output;
                view_apply_fullscreen_geometry(view, view->fullscreen);
        } else {
-               /* restore to normal */
+               view->fullscreen = false;
+               /* Restore non-fullscreen geometry */
                if (view->maximized) {
                        view_apply_maximized_geometry(view);
                } else if (view->tiled) {
@@ -616,7 +621,10 @@ view_set_fullscreen(struct view *view, bool fullscreen,
                } else {
                        view_apply_unmaximized_geometry(view);
                }
-               view->fullscreen = false;
+               /* Re-show decorations when no longer fullscreen */
+               if (view->ssd_enabled) {
+                       ssd_create(view, view == view->server->focused_view);
+               }
        }
 
        /* Show fullscreen views above top-layer */
@@ -875,7 +883,7 @@ void
 view_reload_ssd(struct view *view)
 {
        assert(view);
-       if (view->ssd_enabled) {
+       if (view->ssd_enabled && !view->fullscreen) {
                ssd_destroy(view);
                ssd_create(view, view == view->server->focused_view);
        }