From c05eec7f53a8f1af25826cdc5bb3104b791e8cbb Mon Sep 17 00:00:00 2001
From: DreamMaoMao <2523610504@qq.com>
Date: Fri, 13 Feb 2026 20:02:23 +0800
Subject: [PATCH] feat: support restore stack from non-tile state

---
 src/dispatch/bind_define.h |  8 +++++---
 src/layout/arrange.h       | 39 ++++++++++++++++++++++++++++++++++++++
 src/mango.c                |  6 +++---
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h
index ea213e4..0bfab15 100644
--- a/src/dispatch/bind_define.h
+++ b/src/dispatch/bind_define.h
@@ -1217,13 +1217,15 @@ int32_t togglefloating(const Arg *arg) {
 	if (!sel)
 		return 0;
 
+	bool isfloating = sel->isfloating;
+
 	if ((sel->isfullscreen || sel->ismaximizescreen)) {
-		sel->isfloating = 1;
+		isfloating = 1;
 	} else {
-		sel->isfloating = !sel->isfloating;
+		isfloating = !sel->isfloating;
 	}
 
-	setfloating(sel, sel->isfloating);
+	setfloating(sel, isfloating);
 	return 0;
 }
 
diff --git a/src/layout/arrange.h b/src/layout/arrange.h
index 3721364..cc4bc07 100644
--- a/src/layout/arrange.h
+++ b/src/layout/arrange.h
@@ -1,3 +1,42 @@
+void restore_size_per(Monitor *m, Client *c) {
+	Client *fc = NULL;
+	double total_master_inner_per = 0;
+	double total_stack_inner_per = 0;
+
+	if (!m || !c)
+		return;
+
+	const Layout *current_layout = m->pertag->ltidxs[m->pertag->curtag];
+
+	if (current_layout->id == SCROLLER ||
+		current_layout->id == VERTICAL_SCROLLER || current_layout->id == GRID ||
+		current_layout->id == VERTICAL_GRID || current_layout->id == DECK ||
+		current_layout->id == VERTICAL_DECK ||
+		current_layout->id == CENTER_TILE || current_layout->id == MONOCLE) {
+		return;
+	}
+
+	if (current_layout->id == CENTER_TILE || c->ismaster) {
+		set_size_per(m, c);
+		return;
+	}
+
+	wl_list_for_each(fc, &clients, link) {
+		if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) {
+			if (fc->ismaster) {
+				total_master_inner_per += fc->master_inner_per;
+			} else {
+				total_stack_inner_per += fc->stack_inner_per;
+			}
+		}
+	}
+
+	if (!c->ismaster && total_stack_inner_per) {
+		c->stack_inner_per = total_stack_inner_per * c->stack_inner_per /
+							 (1 - c->stack_inner_per);
+	}
+}
+
 void set_size_per(Monitor *m, Client *c) {
 	Client *fc = NULL;
 	bool found = false;
diff --git a/src/mango.c b/src/mango.c
index b0fde12..45e0289 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -4810,7 +4810,7 @@ setfloating(Client *c, int32_t floating) {
 	}
 
 	if (!c->isfloating && old_floating_state) {
-		set_size_per(c->mon, c);
+		restore_size_per(c->mon, c);
 	}
 
 	if (!c->force_maximize)
@@ -4896,7 +4896,7 @@ void setmaximizescreen(Client *c, int32_t maximizescreen) {
 	wlr_scene_node_reparent(&c->scene->node,
 							layers[c->isfloating ? LyrTop : LyrTile]);
 	if (!c->ismaximizescreen && old_maximizescreen_state) {
-		set_size_per(c->mon, c);
+		restore_size_per(c->mon, c);
 	}
 
 	if (!c->force_maximize && !c->ismaximizescreen) {
@@ -4967,7 +4967,7 @@ void setfullscreen(Client *c, int32_t fullscreen) // 用自定义全屏代理自
 	}
 
 	if (!c->isfullscreen && old_fullscreen_state) {
-		set_size_per(c->mon, c);
+		restore_size_per(c->mon, c);
 	}
 
 	arrange(c->mon, false, false);