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

opt: blur and shield node mount in root scene of client

Browse source
This commit is contained in:
DreamMaoMao 2026-06-24 11:18:18 +08:00
parent fc2c5ae49f
commit 041a06e659
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/animation/client.h
View file

@ -512,13 +512,16 @@ void apply_shield(Client *c, struct wlr_box clip_box) {
} }
if (active_capture_count > 0 && c->shield_when_capture) { if (active_capture_count > 0 && c->shield_when_capture) {
int32_t shield_x = clip_box.x + (int32_t)c->bw;
int32_t shield_y = clip_box.y + (int32_t)c->bw;
wlr_scene_node_raise_to_top(&c->shield->node); wlr_scene_node_raise_to_top(&c->shield->node);
wlr_scene_node_set_position(&c->shield->node, clip_box.x, clip_box.y); wlr_scene_node_set_position(&c->shield->node, shield_x, shield_y);
wlr_scene_rect_set_size(c->shield, clip_box.width, clip_box.height); wlr_scene_rect_set_size(c->shield, clip_box.width, clip_box.height);
wlr_scene_node_set_enabled(&c->shield->node, true); wlr_scene_node_set_enabled(&c->shield->node, true);
} else { } else {
if (c->shield->node.enabled) { if (c->shield->node.enabled) {
wlr_scene_node_lower_to_bottom(&c->shield->node); wlr_scene_node_lower_to_bottom(&c->shield->node);
wlr_scene_node_set_position(&c->shield->node, 0, 0);
wlr_scene_rect_set_size(c->shield, c->animation.current.width, wlr_scene_rect_set_size(c->shield, c->animation.current.width,
c->animation.current.height); c->animation.current.height);
wlr_scene_node_set_enabled(&c->shield->node, false); wlr_scene_node_set_enabled(&c->shield->node, false);
@ -535,8 +538,10 @@ void client_draw_blur(Client *c, struct wlr_box clip_box, struct ivec2 offset) {
return; return;
} else { } else {
if (config.blur && !c->noblur) { if (config.blur && !c->noblur) {
int32_t blur_x = (int32_t)c->bw + offset.x;
int32_t blur_y = (int32_t)c->bw + offset.y;
wlr_scene_node_set_enabled(&c->blur->node, true); wlr_scene_node_set_enabled(&c->blur->node, true);
wlr_scene_node_set_position(&c->blur->node, offset.x, offset.y); wlr_scene_node_set_position(&c->blur->node, blur_x, blur_y);
wlr_scene_blur_set_size(c->blur, clip_box.width - c->bw, wlr_scene_blur_set_size(c->blur, clip_box.width - c->bw,
clip_box.height - c->bw); clip_box.height - c->bw);
} else { } else {

15
src/mango.c
View file

@ -4755,14 +4755,14 @@ mapnotify(struct wl_listener *listener, void *data) {
wlr_scene_shadow_create(c->scene, 0, 0, config.border_radius, wlr_scene_shadow_create(c->scene, 0, 0, config.border_radius,
config.shadows_blur, config.shadowscolor); config.shadows_blur, config.shadowscolor);
c->blur = wlr_scene_blur_create(c->scene_surface, 0, 0); c->blur = wlr_scene_blur_create(c->scene, 0, 0);
wlr_scene_node_lower_to_bottom(&c->blur->node); wlr_scene_node_lower_to_bottom(&c->blur->node);
wlr_scene_node_lower_to_bottom(&c->shadow->node); wlr_scene_node_lower_to_bottom(&c->shadow->node);
wlr_scene_node_set_enabled(&c->shadow->node, true); wlr_scene_node_set_enabled(&c->shadow->node, true);
c->shield = wlr_scene_rect_create(c->scene_surface, 0, 0, c->shield =
(float[4]){0, 0, 0, 0xff}); wlr_scene_rect_create(c->scene, 0, 0, (float[4]){0, 0, 0, 0xff});
c->shield->node.data = c; c->shield->node.data = c;
wlr_scene_node_lower_to_bottom(&c->shield->node); wlr_scene_node_lower_to_bottom(&c->shield->node);
wlr_scene_node_set_enabled(&c->shield->node, false); wlr_scene_node_set_enabled(&c->shield->node, false);
@ -6556,11 +6556,6 @@ void overview_backup_surface(Client *c) {
wlr_scene_tree_snapshot(&c->scene_surface->node, c->scene); wlr_scene_tree_snapshot(&c->scene_surface->node, c->scene);
wlr_scene_node_set_enabled(&c->overview_scene_surface->node, false); wlr_scene_node_set_enabled(&c->overview_scene_surface->node, false);
wlr_scene_node_set_enabled(&c->scene_surface->node, true); wlr_scene_node_set_enabled(&c->scene_surface->node, true);
wlr_scene_node_reparent(&c->blur->node, c->scene_surface);
wlr_scene_node_lower_to_bottom(&c->blur->node);
wlr_scene_node_reparent(&c->shield->node, c->scene_surface);
wlr_scene_node_raise_to_top(&c->shield->node);
} }
// 普通视图切换到overview时保存窗口的旧状态 // 普通视图切换到overview时保存窗口的旧状态
@ -6606,10 +6601,6 @@ void overview_restore(Client *c, const Arg *arg) {
c->is_restoring_from_ov = (arg->ui & c->tags & TAGMASK) == 0 ? true : false; c->is_restoring_from_ov = (arg->ui & c->tags & TAGMASK) == 0 ? true : false;
if (c->overview_scene_surface) { if (c->overview_scene_surface) {
wlr_scene_node_reparent(&c->blur->node, c->overview_scene_surface);
wlr_scene_node_lower_to_bottom(&c->blur->node);
wlr_scene_node_reparent(&c->shield->node, c->overview_scene_surface);
wlr_scene_node_raise_to_top(&c->shield->node);
wlr_scene_node_destroy(&c->scene_surface->node); wlr_scene_node_destroy(&c->scene_surface->node);
c->scene_surface = c->overview_scene_surface; c->scene_surface = c->overview_scene_surface;
c->overview_scene_surface = NULL; c->overview_scene_surface = NULL;