mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-05 13:29:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: fullscreen windowrule not apply

Browse source
This commit is contained in:
DreamMaoMao 2025-03-13 23:38:48 +08:00
parent 11c7111c7a
commit f5db437511
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
maomao.c
View file

@ -1451,6 +1451,7 @@ applyrules(Client *c) {
c->isterm = r->isterm > 0 ? r->isterm : c->isterm; c->isterm = r->isterm > 0 ? r->isterm : c->isterm;
c->noswallow = r->noswallow > 0? r->noswallow : c->noswallow; c->noswallow = r->noswallow > 0? r->noswallow : c->noswallow;
c->isfloating = r->isfloating > 0 ? r->isfloating : c->isfloating; c->isfloating = r->isfloating > 0 ? r->isfloating : c->isfloating;
c->isfullscreen = r->isfullscreen > 0 ? r->isfullscreen : c->isfullscreen;
c->animation_type_open = c->animation_type_open =
r->animation_type_open == NULL ? c->animation_type_open : r->animation_type_open; r->animation_type_open == NULL ? c->animation_type_open : r->animation_type_open;
c->animation_type_close = c->animation_type_close =
@ -1469,8 +1470,7 @@ applyrules(Client *c) {
// 重新计算居中的坐标 // 重新计算居中的坐标
c->geom = setclient_coordinate_center(c->geom); c->geom = setclient_coordinate_center(c->geom);
} }
if (r->isfullscreen && r->isfullscreen > 0) { if (c->isfullscreen) {
c->isfullscreen = 1;
c->ignore_clear_fullscreen = 1; c->ignore_clear_fullscreen = 1;
} }
} }
@ -4562,7 +4562,7 @@ setfloating(Client *c, int floating) {
c->is_in_scratchpad = 0; c->is_in_scratchpad = 0;
// 让当前tag中的全屏窗口退出全屏参与平铺 // 让当前tag中的全屏窗口退出全屏参与平铺
wl_list_for_each(fc, &clients, wl_list_for_each(fc, &clients,
link) if (fc && c->tags & fc->tags && ISFULLSCREEN(fc)) { link) if (fc && fc != c && c->tags & fc->tags && ISFULLSCREEN(fc)) {
clear_fullscreen_flag(fc); clear_fullscreen_flag(fc);
} }
} }
@ -4777,10 +4777,12 @@ setmon(Client *c, Monitor *m, uint32_t newtags) {
c->tags = newtags c->tags = newtags
? newtags ? newtags
: m->tagset[m->seltags]; /* assign tags of target monitor */ : m->tagset[m->seltags]; /* assign tags of target monitor */
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
setfloating(c, c->isfloating); setfloating(c, c->isfloating);
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
if(c && VISIBLEON(c, c->mon))
focusclient(c,1);
} }
focusclient(focustop(selmon), 1);
} }
void // 17 void // 17