From bd6a71f05e0870a72f97b8b68de9f03dba80826b Mon Sep 17 00:00:00 2001
From: DreamMaoMao <2523610504@qq.com>
Date: Fri, 14 Nov 2025 12:15:34 +0800
Subject: [PATCH] fix: fix border color change when swithc mon focus

---
 src/animation/client.h     | 2 +-
 src/dispatch/bind_define.h | 2 +-
 src/fetch/client.h         | 5 ++++-
 src/mango.c                | 9 +++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/animation/client.h b/src/animation/client.h
index 70da39e..a5236f0 100644
--- a/src/animation/client.h
+++ b/src/animation/client.h
@@ -1084,7 +1084,7 @@ void client_set_focused_opacity_animation(Client *c) {
 	c->opacity_animation.running = true;
 }
 
-void cleint_set_unfocused_opacity_animation(Client *c) {
+void client_set_unfocused_opacity_animation(Client *c) {
 	// Start border color animation to unfocused
 	float *border_color = get_border_color(c);
 
diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h
index d653bb1..c812bf1 100644
--- a/src/dispatch/bind_define.h
+++ b/src/dispatch/bind_define.h
@@ -202,7 +202,7 @@ int focusmon(const Arg *arg) {
 		focusclient(c, 1);
 
 	if (old_selmon_sel) {
-		setborder_color(old_selmon_sel);
+		client_set_unfocused_opacity_animation(old_selmon_sel);
 	}
 	return 0;
 }
diff --git a/src/fetch/client.h b/src/fetch/client.h
index 6e67522..5f62d23 100644
--- a/src/fetch/client.h
+++ b/src/fetch/client.h
@@ -374,7 +374,10 @@ Client *get_next_stack_client(Client *c, bool reverse) {
 }
 
 float *get_border_color(Client *c) {
-	if (c->isurgent) {
+
+	if (c->mon != selmon) {
+		return bordercolor;
+	} else if (c->isurgent) {
 		return urgentcolor;
 	} else if (c->is_in_scratchpad && selmon && c == selmon->sel) {
 		return scratchpadcolor;
diff --git a/src/mango.c b/src/mango.c
index 285df09..41822bc 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -3103,6 +3103,9 @@ void destroykeyboardgroup(struct wl_listener *listener, void *data) {
 }
 
 void focusclient(Client *c, int lift) {
+
+	Client *last_focus_client = NULL;
+
 	struct wlr_surface *old_keyboard_focus_surface =
 		seat->keyboard_state.focused_surface;
 
@@ -3137,12 +3140,14 @@ void focusclient(Client *c, int lift) {
 
 	if (c && !c->iskilling && !client_is_unmanaged(c) && c->mon) {
 
+		last_focus_client = selmon->sel;
 		selmon = c->mon;
 		selmon->prevsel = selmon->sel;
 		selmon->sel = c;
 
-		if (selmon->prevsel && !selmon->prevsel->iskilling) {
-			cleint_set_unfocused_opacity_animation(selmon->prevsel);
+		if (last_focus_client && !last_focus_client->iskilling &&
+			last_focus_client != c) {
+			client_set_unfocused_opacity_animation(last_focus_client);
 		}
 
 		client_set_focused_opacity_animation(c);