From 4854f8e42df7436ac1f226b9a3e04ea3d8fe6084 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Mon, 15 Dec 2025 18:15:16 +0100
Subject: [PATCH] shell/elements: Don't render border when maximized

---
 src/shell/element/stack.rs  | 6 +++---
 src/shell/element/window.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index fc1e27b3..5ce96832 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -763,7 +763,7 @@ impl CosmicStack {
             let window_key =
                 CosmicMappedKey(CosmicMappedKeyInner::Stack(Arc::downgrade(&self.0.0)));
 
-            let border = {
+            let border = (!maximized).then(|| {
                 let (r, g, b, a) = theme.cosmic().bg_divider().into_components();
                 CosmicStackRenderElement::Border(IndicatorShader::element(
                     renderer,
@@ -774,9 +774,9 @@ impl CosmicStack {
                     a * alpha,
                     [r, g, b],
                 ))
-            };
+            });
 
-            std::iter::once(border).chain(
+            border.into_iter().chain(
                 windows[active]
                     .render_elements::<R, WaylandSurfaceRenderElement<R>>(
                         renderer,
diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs
index c1f129b2..d0f54047 100644
--- a/src/shell/element/window.rs
+++ b/src/shell/element/window.rs
@@ -484,7 +484,7 @@ impl CosmicWindow {
             geo.size.h += SSD_HEIGHT as f64;
         }
 
-        if has_ssd || clip {
+        if (has_ssd || clip) && !is_maximized {
             let window_key =
                 CosmicMappedKey(CosmicMappedKeyInner::Window(Arc::downgrade(&self.0.0)));