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

opt: optimzie float client overlap

Browse source
This commit is contained in:
DreamMaoMao 2025-10-06 09:40:20 +08:00
parent 54444a2a6b
commit a765641f4c
1 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/mango.c
View file

@ -1182,16 +1182,38 @@ int applyrulesgeom(Client *c) {
void set_float_malposition(Client *tc) { void set_float_malposition(Client *tc) {
Client *c = NULL; Client *c = NULL;
int x, y, offset; int x, y, offset, xreverse, yreverse;
x = tc->geom.x; x = tc->geom.x;
y = tc->geom.y; y = tc->geom.y;
offset = MIN(tc->mon->m.width / 20, tc->mon->m.height / 20); xreverse = 1;
yreverse = 1;
offset = MIN(tc->mon->w.width / 20, tc->mon->w.height / 20);
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->isfloating && c != tc && VISIBLEON(c, tc->mon) && if (c->isfloating && c != tc && VISIBLEON(c, tc->mon) &&
x - c->geom.x < offset && y - c->geom.y < offset) { abs(x - c->geom.x) < offset && abs(y - c->geom.y) < offset) {
x = c->geom.x + offset;
y = c->geom.y + offset; x = c->geom.x + offset * xreverse;
y = c->geom.y + offset * yreverse;
if (x < tc->mon->w.x) {
x = x + offset;
xreverse = 1;
}
if (y < tc->mon->w.y) {
y = y + offset;
yreverse = 1;
}
if (x + tc->geom.width > tc->mon->w.x + tc->mon->w.width) {
x = x - offset;
xreverse = -1;
}
if (y + tc->geom.height > tc->mon->w.y + tc->mon->w.height) {
y = y - offset;
yreverse = -1;
}
} }
} }
@ -1247,7 +1269,7 @@ void applyrules(Client *c) {
c->float_geom.height = r->height; c->float_geom.height = r->height;
if (r->offsetx || r->offsety || r->width > 0 || r->height > 0) { if (r->offsetx || r->offsety || r->width > 0 || r->height > 0) {
hit_rule_pos = true; hit_rule_pos = r->offsetx || r->offsety ? true : false;
c->iscustomsize = 1; c->iscustomsize = 1;
c->float_geom = setclient_coordinate_center(c, c->float_geom, c->float_geom = setclient_coordinate_center(c, c->float_geom,
r->offsetx, r->offsety); r->offsetx, r->offsety);
@ -1318,7 +1340,9 @@ void applyrules(Client *c) {
arrange(c->mon, false); arrange(c->mon, false);
} }
if (c->isfloating && !hit_rule_pos) { if (c->isfloating && !hit_rule_pos && !c->isnamedscratchpad) {
wl_list_remove(&c->link);
wl_list_insert(clients.prev, &c->link);
set_float_malposition(c); set_float_malposition(c);
} }