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

fix: error tag animation direction in some scroller layout case

Browse source
This commit is contained in:
DreamMaoMao 2025-09-13 20:05:18 +08:00
parent 08c5ba33ff
commit 3679e7faba
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/layout/horizontal.h
View file

@ -347,8 +347,8 @@ void scroller(Monitor *m) {
if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating && if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating &&
!m->sel->ismaxmizescreen && !m->sel->isfullscreen) { !m->sel->ismaxmizescreen && !m->sel->isfullscreen) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevtilesel && !client_is_unmanaged(m->prevtilesel)) { } else if (m->prevsel && !client_is_unmanaged(m->prevsel)) {
root_client = m->prevtilesel; root_client = m->prevsel;
} else { } else {
root_client = center_select(m); root_client = center_select(m);
} }
@ -380,8 +380,8 @@ void scroller(Monitor *m) {
if (need_scroller) { if (need_scroller) {
if (scroller_focus_center || if (scroller_focus_center ||
((!m->prevtilesel || ((!m->prevsel ||
(m->prevtilesel->scroller_proportion * max_client_width) + (m->prevsel->scroller_proportion * max_client_width) +
(root_client->scroller_proportion * max_client_width) > (root_client->scroller_proportion * max_client_width) >
m->w.width - 2 * scroller_structs - cur_gappih) && m->w.width - 2 * scroller_structs - cur_gappih) &&
scroller_prefer_center)) { scroller_prefer_center)) {

8
src/layout/vertical.h
View file

@ -333,8 +333,8 @@ void vertical_scroller(Monitor *m) {
if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating && if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating &&
!m->sel->ismaxmizescreen && !m->sel->isfullscreen) { !m->sel->ismaxmizescreen && !m->sel->isfullscreen) {
root_client = m->sel; root_client = m->sel;
} else if (m->prevtilesel && !client_is_unmanaged(m->prevtilesel)) { } else if (m->prevsel && !client_is_unmanaged(m->prevsel)) {
root_client = m->prevtilesel; root_client = m->prevsel;
} else { } else {
root_client = center_select(m); root_client = center_select(m);
} }
@ -366,8 +366,8 @@ void vertical_scroller(Monitor *m) {
if (need_scroller) { if (need_scroller) {
if (scroller_focus_center || if (scroller_focus_center ||
((!m->prevtilesel || ((!m->prevsel ||
(m->prevtilesel->scroller_proportion * max_client_height) + (m->prevsel->scroller_proportion * max_client_height) +
(root_client->scroller_proportion * max_client_height) > (root_client->scroller_proportion * max_client_height) >
m->w.height - 2 * scroller_structs - cur_gappiv) && m->w.height - 2 * scroller_structs - cur_gappiv) &&
scroller_prefer_center)) { scroller_prefer_center)) {

19
src/mango.c
View file

@ -433,7 +433,7 @@ struct Monitor {
int gappoh; /* horizontal outer gaps */ int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */ int gappov; /* vertical outer gaps */
Pertag *pertag; Pertag *pertag;
Client *sel, *prevtilesel; Client *sel, *prevsel;
int isoverview; int isoverview;
int is_in_hotarea; int is_in_hotarea;
int gamma_lut_changed; int gamma_lut_changed;
@ -1899,7 +1899,7 @@ buttonpress(struct wl_listener *listener, void *data) {
client_update_oldmonname_record(grabc, selmon); client_update_oldmonname_record(grabc, selmon);
setmon(grabc, selmon, 0, true); setmon(grabc, selmon, 0, true);
reset_foreign_tolevel(grabc); reset_foreign_tolevel(grabc);
selmon->prevtilesel = ISTILED(selmon->sel) ? selmon->sel : NULL; selmon->prevsel = ISTILED(selmon->sel) ? selmon->sel : NULL;
selmon->sel = grabc; selmon->sel = grabc;
tmpc = grabc; tmpc = grabc;
grabc = NULL; grabc = NULL;
@ -3063,12 +3063,15 @@ void focusclient(Client *c, int lift) {
if (c && !c->iskilling && !client_is_unmanaged(c) && c->mon) { if (c && !c->iskilling && !client_is_unmanaged(c) && c->mon) {
selmon = c->mon; selmon = c->mon;
selmon->prevtilesel = ISTILED(selmon->sel) ? selmon->sel : NULL; selmon->prevsel = selmon->sel;
selmon->sel = c; selmon->sel = c;
// decide whether need to re-arrange // decide whether need to re-arrange
if (c && ISTILED(c) && VISIBLEON(c, selmon) && !INSIDEMON(c) && if (c && selmon->prevsel &&
(selmon->prevsel->tags & selmon->tagset[selmon->seltags]) &&
(c->tags & selmon->tagset[selmon->seltags]) && !c->isfloating &&
!c->isfullscreen && !c->ismaxmizescreen &&
is_scroller_layout(selmon)) { is_scroller_layout(selmon)) {
arrange(selmon, false); arrange(selmon, false);
} }
@ -4524,8 +4527,8 @@ void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus) {
oldmon->sel = NULL; oldmon->sel = NULL;
} }
if (oldmon && oldmon->prevtilesel == c) { if (oldmon && oldmon->prevsel == c) {
oldmon->prevtilesel = NULL; oldmon->prevsel = NULL;
} }
c->mon = m; c->mon = m;
@ -5131,8 +5134,8 @@ void unmapnotify(struct wl_listener *listener, void *data) {
if (c == m->sel) { if (c == m->sel) {
m->sel = NULL; m->sel = NULL;
} }
if (c == m->prevtilesel) { if (c == m->prevsel) {
m->prevtilesel = NULL; m->prevsel = NULL;
} }
} }