From bf5dc1c841c6477e76df8a68c816589f08e3fdfd Mon Sep 17 00:00:00 2001
From: Mental-Vortex <206187961+Mental-Vortex@users.noreply.github.com>
Date: Fri, 12 Dec 2025 03:40:01 +0800
Subject: [PATCH] feat: restore scroller geom in setfullscreen

---
 src/mango.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/mango.c b/src/mango.c
index ce22e31d..bd63d3e0 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -301,7 +301,7 @@ struct Client {
 	/* Must keep these three elements in this order */
 	uint32_t type; /* XDGShell or X11* */
 	struct wlr_box geom, pending, float_geom, animainit_geom,
-		overview_backup_geom, current,
+		overview_backup_geom, current, scroller_geom,
 		drag_begin_geom; /* layout-relative, includes border */
 	Monitor *mon;
 	struct wlr_scene_tree *scene;
@@ -4630,6 +4630,7 @@ void setfakefullscreen(Client *c, int fakefullscreen) {
 
 void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带全屏
 {
+	int was_fullscreen = c->isfullscreen;
 
 	if (!c || !c->mon || !client_surface(c)->mapped || c->iskilling)
 		return;
@@ -4648,6 +4649,10 @@ void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带
 		if (c->isfloating)
 			c->float_geom = c->geom;
 
+		if (!was_fullscreen && is_scroller_layout(c->mon)) {
+			c->scroller_geom = c->geom;
+		}
+
 		c->bw = 0;
 		wlr_scene_node_raise_to_top(&c->scene->node); // 将视图提升到顶层
 		if (!is_scroller_layout(c->mon) || c->isfloating)
@@ -4659,6 +4664,9 @@ void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带
 		c->isfakefullscreen = 0;
 		if (c->isfloating)
 			setfloating(c, 1);
+
+		if (was_fullscreen && is_scroller_layout(c->mon))
+			c->geom = c->scroller_geom;
 	}
 
 	if (c->isoverlay) {