shod

commit 436458c512c80295e13fa00c32d38050db694ff6
parent b9cc904dc83a3e73417f241333133c8650b44377
Author: Lucas de Sena <lucas@seninha.org>
Date:   Sat, 22 Apr 2023 10:57:48 -0300

fix menu hiding and minimization

Diffstat:
M
xcontainer.c
 | 
11
++++-------
M
xmenu.c
 | 
4
++--

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/xcontainer.c b/xcontainer.c
@@ -680,13 +680,7 @@ containerminimize(struct Container *c, int minimize, int focus)
 			}
 		}
 	} else if (minimize != ADD && c->isminimized) {
-		c->isminimized = 0;
-		(void)containersendtodesk(c, wm.selmon, wm.selmon->seldesk);
-		containermoveresize(c, 1);
-		containerhide(c, 0);
 		tabfocus(c->selcol->selrow->seltab, 0);
-	} else {
-		return;
 	}
 }
 
@@ -1679,7 +1673,10 @@ tabfocus(struct Tab *tab, int gotodesk)
 			tabclearurgency(tab);
 		containeraddfocus(c);
 		containerdecorate(c, NULL, NULL, 1, 0);
-		containerminimize(c, 0, 0);
+		c->isminimized = 0;
+		(void)containersendtodesk(c, wm.selmon, wm.selmon->seldesk);
+		containermoveresize(c, 1);
+		containerhide(c, 0);
 		containerraise(c, c->isfullscreen, c->abovebelow);
 		shodgrouptab(c);
 		shodgroupcontainer(c);
diff --git a/xmenu.c b/xmenu.c
@@ -231,9 +231,9 @@ menuupdate(void)
 
 	TAILQ_FOREACH(obj, &wm.menuq, entry) {
 		menu = ((struct Menu *)obj);
-		if (menu->leader == None || wm.showingdesk)
+		if (menu->leader == None)
 			continue;
-		if (wm.focused != NULL && istabformenu(wm.focused->selcol->selrow->seltab, menu)) {
+		if (!wm.showingdesk && wm.focused != NULL && istabformenu(wm.focused->selcol->selrow->seltab, menu)) {
 			XMapWindow(dpy, menu->frame);
 			icccmwmstate(obj->win, NormalState);
 		} else {