From 0312f9a2017de92abf82386c979bee74d7a0255d Mon Sep 17 00:00:00 2001
From: Hojjat <hojjat.abdollahi@gmail.com>
Date: Wed, 27 May 2026 18:16:38 -0600
Subject: [PATCH] fix: draw the focused window border for the current window
 only

---
 src/shell/workspace.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index ce5bf624..31682bf4 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -1753,13 +1753,17 @@ impl Workspace {
                 self.floating_layer
                     .render::<R>(
                         renderer,
-                        focused.as_ref().and_then(|target| {
-                            if let FocusTarget::Window(mapped) = target {
-                                Some(mapped)
-                            } else {
-                                None
-                            }
-                        }),
+                        render_focus
+                            .then(|| {
+                                focused.as_ref().and_then(|target| {
+                                    if let FocusTarget::Window(mapped) = target {
+                                        Some(mapped)
+                                    } else {
+                                        None
+                                    }
+                                })
+                            })
+                            .flatten(),
                         resize_indicator.clone(),
                         indicator_thickness,
                         alpha,