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

fix: error border offset for zomm out animation

Browse source
This commit is contained in:
DreamMaoMao 2025-03-02 21:03:06 +08:00
parent 69c103c846
commit e2a9f24972
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
maomao.c
View file

@ -768,6 +768,8 @@ double find_animation_curve_at(double t, int type) {
// 有 bug,只是让上面那根透明了 // 有 bug,只是让上面那根透明了
void apply_opacity_to_rect_nodes(Client *c, struct wlr_scene_node *node, void apply_opacity_to_rect_nodes(Client *c, struct wlr_scene_node *node,
double animation_passed) { double animation_passed) {
int offsetx = 0;
int offsety = 0;
if (node->type == WLR_SCENE_NODE_RECT) { if (node->type == WLR_SCENE_NODE_RECT) {
struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node); struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node);
// Assuming the rect has a color field and we can modify it // Assuming the rect has a color field and we can modify it
@ -779,20 +781,20 @@ void apply_opacity_to_rect_nodes(Client *c, struct wlr_scene_node *node,
// TODO: 判断当前窗口是否在屏幕外，如果在屏幕外就不要绘制 // TODO: 判断当前窗口是否在屏幕外，如果在屏幕外就不要绘制
// 划出的border剪切屏幕之外的，这里底部bttome可以了，左右的还不不对 // 划出的border剪切屏幕之外的，这里底部bttome可以了，左右的还不不对
// if(node->y > c->geom.height/2 && c->geom.y + c->animation.current.y + offsetx = c->geom.width - c->animation.current.width;
// node->y >= c->mon->m.y + c->mon->m.height){ offsety = c->geom.height - c->animation.current.height;
// wlr_scene_rect_set_size(rect, 0, 0); // down if(node->y > c->geom.y + c->geom.height/2 ){
// } else if(node->x > c->geom.width/2 && c->geom.y + wlr_scene_node_set_position(node,c->geom.x,c->geom.y + c->geom.height - offsety);
// c->animation.current.y + node->y >= c->mon->m.y + c->mon->m.height) { wlr_scene_rect_set_size(rect, c->animation.current.width, c->bw); // down
// wlr_scene_rect_set_size(rect, c->bw,rect->height - (c->geom.y + } else if(node->y < c->geom.y + c->geom.height/2 && rect->width > rect->height) {
// c->animation.current.y + node->y - c->mon->m.y - c->mon->m.height)); // wlr_scene_node_set_position(node,c->geom.x,c->geom.y);
// right wlr_scene_rect_set_size(rect, c->animation.current.width, c->bw); // up
// } else if(rect->height > rect->width && c->geom.y + } else if(node->x < c->geom.x + c->geom.width/2 && rect->width < rect->height) {
// c->animation.current.y + node->y >= c->mon->m.y + c->mon->m.height) { wlr_scene_rect_set_size(rect,c->bw,c->animation.current.height); // left
// wlr_scene_rect_set_size(rect, c->bw,rect->height - (c->geom.y + } else {
// c->animation.current.y + node->y - c->mon->m.y - c->mon->m.height)); // wlr_scene_node_set_position(node,c->geom.x + c->geom.width - offsetx,c->geom.y);
// left wlr_scene_rect_set_size(rect,c->bw,c->animation.current.height); // right
// } }
} }
// If the node is a tree, recursively traverse its children // If the node is a tree, recursively traverse its children
@ -5753,11 +5755,12 @@ void init_fadeout_client(Client *c) {
} }
fadeout_cient->animation.duration = animation_duration_close; fadeout_cient->animation.duration = animation_duration_close;
fadeout_cient->current = fadeout_cient->animainit_geom = fadeout_cient->geom = fadeout_cient->current = fadeout_cient->animainit_geom =
fadeout_cient->animation.initial = c->animation.current; fadeout_cient->animation.initial = c->animation.current;
fadeout_cient->mon = c->mon; fadeout_cient->mon = c->mon;
fadeout_cient->animation_type = c->animation_type; fadeout_cient->animation_type = c->animation_type;
fadeout_cient->animation.action = CLOSE; fadeout_cient->animation.action = CLOSE;
fadeout_cient->bw = c->bw;
// 这里snap节点的坐标设置是使用的相对坐标，所以不能加上原来坐标 // 这里snap节点的坐标设置是使用的相对坐标，所以不能加上原来坐标
// 这跟普通node有区别 // 这跟普通node有区别