mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2026-03-01 01:40:19 -05:00
fix: fix multi master focus record error
This commit is contained in:
parent
dfedc205e8
commit
ef92029ae0
1 changed files with 11 additions and 5 deletions
|
|
@ -574,23 +574,29 @@ bool client_is_in_same_stack(Client *sc, Client *tc, Client *fc) {
|
||||||
|
|
||||||
if (id == TILE || id == VERTICAL_TILE || id == DECK ||
|
if (id == TILE || id == VERTICAL_TILE || id == DECK ||
|
||||||
id == VERTICAL_DECK || id == RIGHT_TILE) {
|
id == VERTICAL_DECK || id == RIGHT_TILE) {
|
||||||
if (fc && !fc->ismaster)
|
if (tc->ismaster ^ sc->ismaster)
|
||||||
return false;
|
return false;
|
||||||
else if (!sc->ismaster)
|
if (fc && !(fc->ismaster ^ sc->ismaster))
|
||||||
|
return false;
|
||||||
|
else
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id == TGMIX) {
|
if (id == TGMIX) {
|
||||||
if (fc && !fc->ismaster)
|
if (tc->ismaster ^ sc->ismaster)
|
||||||
|
return false;
|
||||||
|
if (fc && !(fc->ismaster ^ sc->ismaster))
|
||||||
return false;
|
return false;
|
||||||
if (!sc->ismaster && sc->mon->visible_tiling_clients <= 3)
|
if (!sc->ismaster && sc->mon->visible_tiling_clients <= 3)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id == CENTER_TILE) {
|
if (id == CENTER_TILE) {
|
||||||
if (fc && !fc->ismaster)
|
if (tc->ismaster ^ sc->ismaster)
|
||||||
return false;
|
return false;
|
||||||
if (!sc->ismaster && sc->geom.x == tc->geom.x)
|
if (fc && !(fc->ismaster ^ sc->ismaster))
|
||||||
|
return false;
|
||||||
|
if (sc->geom.x == tc->geom.x)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue