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

opt: Increase defensive conditions for layer animation

Browse source
This commit is contained in:
DreamMaoMao 2025-06-29 15:17:47 +08:00
parent fed194ffd1
commit 238ecda316
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/maomao.c
View file

@ -1003,6 +1003,9 @@ void fadeout_client_animation_next_tick(Client *c) {
void layer_animation_next_tick(LayerSurface *l) { void layer_animation_next_tick(LayerSurface *l) {
if (!l || !l->mapped)
return;
double animation_passed = double animation_passed =
(double)l->animation.passed_frames / l->animation.total_frames; (double)l->animation.passed_frames / l->animation.total_frames;
@ -3175,6 +3178,10 @@ static void iter_layer_scene_buffers(struct wlr_scene_buffer *buffer, int sx,
} }
void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) { void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
if (!l || !l->mapped)
return;
const struct wlr_layer_surface_v1_state *state = &l->layer_surface->current; const struct wlr_layer_surface_v1_state *state = &l->layer_surface->current;
// 限制区域 // 限制区域
@ -3253,6 +3260,8 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
void maplayersurfacenotify(struct wl_listener *listener, void *data) { void maplayersurfacenotify(struct wl_listener *listener, void *data) {
int ji; int ji;
LayerSurface *l = wl_container_of(listener, l, map); LayerSurface *l = wl_container_of(listener, l, map);
l->mapped = 1;
if (!l->mon) if (!l->mon)
return; return;
struct wlr_layer_surface_v1 *layer_surface = l->layer_surface; struct wlr_layer_surface_v1 *layer_surface = l->layer_surface;
@ -3286,7 +3295,6 @@ void maplayersurfacenotify(struct wl_listener *listener, void *data) {
} }
l->need_output_flush = true; l->need_output_flush = true;
l->mapped = 1;
l->animation.action = OPEN; l->animation.action = OPEN;
layer_set_pending_state(l); layer_set_pending_state(l);
// 刷新布局，让窗口能感应到exclude_zone变化 // 刷新布局，让窗口能感应到exclude_zone变化
@ -3317,7 +3325,8 @@ void commitlayersurfacenotify(struct wl_listener *listener, void *data) {
get_layer_target_geometry(l, &box); get_layer_target_geometry(l, &box);
if (wlr_layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM && if (l->mapped &&
wlr_layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM &&
wlr_layer_surface->current.layer != wlr_layer_surface->current.layer !=
ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND && ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND &&
!wlr_box_equal(&box, &l->geom)) { !wlr_box_equal(&box, &l->geom)) {
@ -3381,6 +3390,9 @@ void commitlayersurfacenotify(struct wl_listener *listener, void *data) {
void layer_set_pending_state(LayerSurface *l) { void layer_set_pending_state(LayerSurface *l) {
if (!l || !l->mapped)
return;
l->pending = l->geom; l->pending = l->geom;
if (l->animation.action == OPEN) if (l->animation.action == OPEN)
set_layer_open_animaiton(l, l->geom); set_layer_open_animaiton(l, l->geom);
@ -3436,6 +3448,10 @@ double output_frame_duration_ms() {
} }
void layer_commit(LayerSurface *l) { void layer_commit(LayerSurface *l) {
if (!l || !l->mapped)
return;
l->current = l->pending; // 设置动画的结束位置 l->current = l->pending; // 设置动画的结束位置
if (l->animation.should_animate) { if (l->animation.should_animate) {
@ -5624,6 +5640,9 @@ void set_layer_open_animaiton(LayerSurface *l, struct wlr_box geo) {
int vertical, vertical_value; int vertical, vertical_value;
int center_x, center_y; int center_x, center_y;
if (!l || !l->mapped)
return;
center_x = l->geom.x + l->geom.width / 2; center_x = l->geom.x + l->geom.width / 2;
center_y = l->geom.y + l->geom.height / 2; center_y = l->geom.y + l->geom.height / 2;
horizontal = horizontal =