mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-02-05 04:06:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: adjust scenefx blur node feature.

Browse source
This commit is contained in:
DreamMaoMao 2025-11-07 10:02:51 +08:00
parent 5bbe6c5c1a
commit ab9013cfc5
4 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/animation/client.h
View file

@ -535,6 +535,8 @@ void client_apply_clip(Client *c, float factor) {
}
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
wlr_scene_blur_set_size(c->blur, clip_box.width - c->bw,
clip_box.height - c->bw);
buffer_set_effect(c, (BufferData){1.0f, 1.0f, clip_box.width,
clip_box.height,
current_corner_location, true});
@ -583,6 +585,7 @@ void client_apply_clip(Client *c, float factor) {
// 应用窗口表面剪切
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
wlr_scene_blur_set_size(c->blur, clip_box.width, clip_box.height);
// 获取剪切后的表面的实际大小用于计算缩放
int acutal_surface_width = geometry.width - offset.x - offset.width;
@ -987,6 +990,8 @@ void resize(Client *c, struct wlr_box geo, int interact) {
apply_border(c);
client_get_clip(c, &clip);
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
wlr_scene_blur_set_size(c->blur, clip.width - c->bw,
clip.height - c->bw);
return;
}
// 如果不是工作区切换时划出去的窗口，就让动画的结束位置，就是上面的真实位置和大小

4
src/animation/common.h
View file

@ -162,7 +162,7 @@ static bool scene_node_snapshot(struct wlr_scene_node *node, int lx, int ly,
// snapshot_buffer, scene_buffer->backdrop_blur_optimized);
// wlr_scene_buffer_set_backdrop_blur_ignore_transparent(
// snapshot_buffer, scene_buffer->backdrop_blur_ignore_transparent);
wlr_scene_buffer_set_backdrop_blur(snapshot_buffer, false);
// wlr_scene_buffer_set_backdrop_blur(snapshot_buffer, false);
snapshot_buffer->node.data = scene_buffer->node.data;
@ -198,6 +198,8 @@ static bool scene_node_snapshot(struct wlr_scene_node *node, int lx, int ly,
break;
}
case WLR_SCENE_NODE_BLUR:
return true;
case WLR_SCENE_NODE_OPTIMIZED_BLUR:
return true;
}

8
src/animation/layer.h
View file

@ -356,6 +356,10 @@ void layer_animation_next_tick(LayerSurface *l) {
.height = height,
};
if (blur && blur_layer && !l->noblur && l->blur)
wlr_scene_blur_set_size(l->blur, l->animation.current.width,
l->animation.current.height);
if (animation_passed >= 1.0) {
l->animation.running = false;
l->need_output_flush = false;
@ -565,6 +569,10 @@ bool layer_draw_frame(LayerSurface *l) {
layer_draw_shadow(l);
} else {
layer_draw_shadow(l);
if (blur && blur_layer && !l->noblur && l->blur) {
wlr_scene_node_set_enabled(&l->blur->node, true);
wlr_scene_blur_set_size(l->blur, l->geom.width, l->geom.height);
}
l->need_output_flush = false;
}
return true;

45
src/mango.c
View file

@ -276,6 +276,7 @@ struct Client {
struct wlr_scene_tree *scene;
struct wlr_scene_rect *border; /* top, bottom, left, right */
struct wlr_scene_shadow *shadow;
struct wlr_scene_blur *blur;
struct wlr_scene_tree *scene_surface;
struct wl_list link;
struct wl_list flink;
@ -405,6 +406,7 @@ typedef struct {
struct wlr_scene_tree *scene;
struct wlr_scene_tree *popups;
struct wlr_scene_shadow *shadow;
struct wlr_scene_blur *blur;
struct wlr_scene_layer_surface_v1 *scene_layer;
struct wl_list link;
struct wl_list fadeout_link;
@ -2082,12 +2084,15 @@ static void iter_layer_scene_buffers(struct wlr_scene_buffer *buffer, int sx,
return;
}
wlr_scene_buffer_set_backdrop_blur(buffer, true);
wlr_scene_buffer_set_backdrop_blur_ignore_transparent(buffer, true);
LayerSurface *l = (LayerSurface *)user_data;
wlr_scene_node_set_enabled(&l->blur->node, true);
wlr_scene_blur_set_transparency_mask_source(l->blur, buffer);
if (blur_optimized) {
wlr_scene_buffer_set_backdrop_blur_optimized(buffer, true);
wlr_scene_blur_set_should_only_blur_bottom_layer(l->blur, true);
} else {
wlr_scene_buffer_set_backdrop_blur_optimized(buffer, false);
wlr_scene_blur_set_should_only_blur_bottom_layer(l->blur, false);
}
}
@ -2132,13 +2137,17 @@ void maplayersurfacenotify(struct wl_listener *listener, void *data) {
}
// 初始化阴影
if (layer_surface->current.exclusive_zone == 0 &&
layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM &&
if (layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM &&
layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND) {
l->shadow = wlr_scene_shadow_create(l->scene, 0, 0, border_radius,
shadows_blur, shadowscolor);
wlr_scene_node_lower_to_bottom(&l->shadow->node);
wlr_scene_node_set_enabled(&l->shadow->node, true);
if (layer_surface->current.exclusive_zone == 0) {
l->shadow = wlr_scene_shadow_create(l->scene, 0, 0, border_radius,
shadows_blur, shadowscolor);
wlr_scene_node_lower_to_bottom(&l->shadow->node);
wlr_scene_node_set_enabled(&l->shadow->node, true);
}
l->blur = wlr_scene_blur_create(l->scene, 0, 0);
wlr_scene_node_lower_to_bottom(&l->blur->node);
}
// 初始化动画
@ -2195,7 +2204,8 @@ void commitlayersurfacenotify(struct wl_listener *listener, void *data) {
if (!l->noblur &&
layer_surface->current.layer != ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM &&
layer_surface->current.layer !=
ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND) {
ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND &&
l->blur) {
wlr_scene_node_for_each_buffer(&l->scene->node,
iter_layer_scene_buffers, l);
@ -3522,15 +3532,15 @@ static void iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int sx,
return;
if (blur && c && !c->noblur) {
wlr_scene_buffer_set_backdrop_blur(buffer, true);
wlr_scene_buffer_set_backdrop_blur_ignore_transparent(buffer, false);
wlr_scene_node_set_enabled(&c->blur->node, true);
wlr_scene_blur_set_transparency_mask_source(c->blur, buffer);
if (blur_optimized) {
wlr_scene_buffer_set_backdrop_blur_optimized(buffer, true);
wlr_scene_blur_set_should_only_blur_bottom_layer(c->blur, true);
} else {
wlr_scene_buffer_set_backdrop_blur_optimized(buffer, false);
wlr_scene_blur_set_should_only_blur_bottom_layer(c->blur, false);
}
} else {
wlr_scene_buffer_set_backdrop_blur(buffer, false);
wlr_scene_node_set_enabled(&c->blur->node, false);
}
}
@ -3643,6 +3653,9 @@ mapnotify(struct wl_listener *listener, void *data) {
c->shadow = wlr_scene_shadow_create(c->scene, 0, 0, border_radius,
shadows_blur, shadowscolor);
c->blur = wlr_scene_blur_create(c->scene_surface, 0, 0);
wlr_scene_node_lower_to_bottom(&c->blur->node);
wlr_scene_node_lower_to_bottom(&c->shadow->node);
wlr_scene_node_set_enabled(&c->shadow->node, true);