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

optimzie animation direction judge

Browse source
This commit is contained in:
DreamMaoMao 2025-02-04 16:22:02 +08:00
parent ff513cddea
commit a574a31265
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
main.c
View file

@ -3568,6 +3568,8 @@ int is_special_animaiton_rule(Client *c) {
if (visible_client_number == 1 && !c->isfloating) { if (visible_client_number == 1 && !c->isfloating) {
return DOWN; return DOWN;
} else if (visible_client_number == 2 && !c->isfloating && !new_is_master) {
return RIGHT;
} else if (!c->isfloating && new_is_master) { } else if (!c->isfloating && new_is_master) {
return LEFT; return LEFT;
} else { } else {
@ -3580,6 +3582,7 @@ void set_open_animaiton(Client *c, struct wlr_box geo) {
int horizontal,horizontal_value; int horizontal,horizontal_value;
int vertical,vertical_value; int vertical,vertical_value;
int special_direction; int special_direction;
int center_x,center_y;
if (strcmp(animation_type, "zoom") == 0 || (c->animation_type && strcmp(c->animation_type, "zoom") == 0)) { if (strcmp(animation_type, "zoom") == 0 || (c->animation_type && strcmp(c->animation_type, "zoom") == 0)) {
c->animainit_geom.width = geo.width * zoom_initial_ratio; c->animainit_geom.width = geo.width * zoom_initial_ratio;
c->animainit_geom.height = geo.height * zoom_initial_ratio; c->animainit_geom.height = geo.height * zoom_initial_ratio;
@ -3588,11 +3591,13 @@ void set_open_animaiton(Client *c, struct wlr_box geo) {
return; return;
} else { } else {
special_direction = is_special_animaiton_rule(c); special_direction = is_special_animaiton_rule(c);
center_x = c->geom.x + c->geom.width/2;
center_y = c->geom.y + c->geom.height/2;
if (special_direction == UNDIR) { if (special_direction == UNDIR) {
horizontal = c->mon->w.x + c->mon->w.width - c->geom.x < c->geom.x - c->mon->w.x ? RIGHT : LEFT; horizontal = c->mon->w.x + c->mon->w.width - center_x < center_x - c->mon->w.x ? RIGHT : LEFT;
horizontal_value = horizontal == LEFT ? c->geom.x - c->mon->w.x : c->mon->w.x + c->mon->w.width - c->geom.x; horizontal_value = horizontal == LEFT ? center_x - c->mon->w.x : c->mon->w.x + c->mon->w.width - center_x;
vertical = c->mon->w.y + c->mon->w.height - c->geom.y < c->geom.y - c->mon->w.y ? DOWN : UP; vertical = c->mon->w.y + c->mon->w.height - center_y < center_y - c->mon->w.y ? DOWN : UP;
vertical_value = vertical == UP ? c->geom.y - c->mon->w.y : c->mon->w.y + c->mon->w.height - c->geom.y; vertical_value = vertical == UP ? center_y - c->mon->w.y : c->mon->w.y + c->mon->w.height - center_y;
slide_direction = horizontal_value < vertical_value ? horizontal : vertical; slide_direction = horizontal_value < vertical_value ? horizontal : vertical;
} else { } else {
slide_direction = special_direction; slide_direction = special_direction;
@ -3607,14 +3612,14 @@ void set_open_animaiton(Client *c, struct wlr_box geo) {
break; break;
case DOWN: case DOWN:
c->animainit_geom.x = c->geom.x; c->animainit_geom.x = c->geom.x;
c->animainit_geom.y = c->mon->w.y + c->geom.height; c->animainit_geom.y = c->mon->w.y + c->mon->w.height + c->geom.height;
break; break;
case LEFT: case LEFT:
c->animainit_geom.x = 0 - c->geom.width; c->animainit_geom.x = 0 - c->geom.width;
c->animainit_geom.y = c->geom.y; c->animainit_geom.y = c->geom.y;
break; break;
case RIGHT: case RIGHT:
c->animainit_geom.x = c->mon->w.x + c->geom.width; c->animainit_geom.x = c->mon->w.x + c->mon->w.width + c->geom.width;
c->animainit_geom.y = c->geom.y; c->animainit_geom.y = c->geom.y;
break; break;
default: default:
@ -3630,21 +3635,23 @@ resize(Client *c, struct wlr_box geo, int interact)
if (!c || !c->mon || !client_surface(c)->mapped) if (!c || !c->mon || !client_surface(c)->mapped)
return; return;
struct wlr_box *bbox; struct wlr_box *bbox,oldgeom;
// struct wlr_box clip; // struct wlr_box clip;
if (!c->mon) if (!c->mon)
return; return;
oldgeom = c->geom;
bbox = interact ? &sgeom : &c->mon->w; bbox = interact ? &sgeom : &c->mon->w;
if(c->is_first_resize) {
set_open_animaiton(c,geo);
} else {
c->animainit_geom = c->geom;
}
client_set_bounds(c, geo.width, geo.height); //去掉这个推荐的窗口大小,因为有时推荐的窗口特别大导致平铺异常 client_set_bounds(c, geo.width, geo.height); //去掉这个推荐的窗口大小,因为有时推荐的窗口特别大导致平铺异常
c->geom = geo; c->geom = geo;
applybounds(c, bbox);//去掉这个推荐的窗口大小,因为有时推荐的窗口特别大导致平铺异常 applybounds(c, bbox);//去掉这个推荐的窗口大小,因为有时推荐的窗口特别大导致平铺异常
if(c->is_first_resize) {
set_open_animaiton(c,c->geom);
} else {
c->animainit_geom = oldgeom;
}
if(c->isnoborder) { if(c->isnoborder) {
c->bw = 0; c->bw = 0;