mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-06-19 14:33:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix: window share shouldn't capture shield client

Browse source
This commit is contained in:
DreamMaoMao 2026-06-19 15:26:47 +08:00
parent e9b551c87d
commit 59a4df0a2b
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/animation/client.h
View file

@ -404,6 +404,11 @@ void client_draw_shadow(Client *c) {
} }
void apply_shield(Client *c, struct wlr_box clip_box) { void apply_shield(Client *c, struct wlr_box clip_box) {
if (clip_box.width <= 0 || clip_box.height <= 0) {
return;
}
if (active_capture_count > 0 && c->shield_when_capture) { if (active_capture_count > 0 && c->shield_when_capture) {
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, clip_box.x, clip_box.y);
@ -933,8 +938,8 @@ void client_apply_clip(Client *c, float factor) {
apply_border(c); apply_border(c);
client_draw_shadow(c); client_draw_shadow(c);
apply_shield(c, clip_box);
client_draw_blur(c, clip_box, offset); client_draw_blur(c, clip_box, offset);
apply_shield(c, clip_box);
if (clip_box.width <= 0 || clip_box.height <= 0) { if (clip_box.width <= 0 || clip_box.height <= 0) {
return; return;
@ -1426,11 +1431,10 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
struct ivec2 offset = clip_to_hide(c, &clip_box); struct ivec2 offset = clip_to_hide(c, &clip_box);
apply_border(c); apply_border(c);
client_draw_shadow(c);
apply_shield(c, clip_box);
client_draw_blur(c, clip_box, offset);
client_get_clip(c, &clip_box); client_get_clip(c, &clip_box);
apply_shield(c, clip_box);
client_draw_shadow(c);
client_draw_blur(c, clip_box, offset);
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
if (config.blur && !c->noblur) if (config.blur && !c->noblur)
wlr_scene_blur_set_size(c->blur, wlr_scene_blur_set_size(c->blur,

3
src/mango.c
View file

@ -5013,6 +5013,9 @@ handle_new_foreign_toplevel_capture_request(struct wl_listener *listener,
*request = data; *request = data;
Client *c = request->toplevel_handle->data; Client *c = request->toplevel_handle->data;
if (c->shield_when_capture)
return;
if (c->image_capture_source == NULL) { if (c->image_capture_source == NULL) {
c->image_capture_source = c->image_capture_source =
wlr_ext_image_capture_source_v1_create_with_scene_node( wlr_ext_image_capture_source_v1_create_with_scene_node(