Skip to content

fix(core): Make blur work with opacity #1983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marc2332 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(core): Make blur work with opacity #1983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 24 additions & 30 deletions crates/freya-core/src/render_pipeline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,30 @@ impl RenderPipeline<'_> {
}
}

// Composite the blur before the opacity layers so its backdrop samples the real content underneath rather than the still empty opacity layer.
if let Some(blur_radius) = effect_state.blur {
let style = element.style();

let image_filter = blur(
(blur_radius * scale_factor, blur_radius * scale_factor),
None,
None,
render_rect.rect(),
);
if let Some(image_filter) = image_filter {
let rec = SaveLayerRec::default()
.bounds(render_rect.rect())
.backdrop(&image_filter);

let blur_layer = self.canvas.save();
if style.corner_radius.is_round() {
self.canvas.clip_rrect(render_rect, ClipOp::Intersect, true);
}
self.canvas.save_layer(&rec);
self.canvas.restore_to_count(blur_layer);
}
}

for opacity in effect_state.opacities.iter() {
self.canvas.save_layer_alpha_f(layer_bounds, *opacity);
}
Expand Down Expand Up @@ -170,36 +194,6 @@ impl RenderPipeline<'_> {
element.render(render_context);
});

if let Some(effect_state) = effect_state {
let visible_area = layout_node.visible_area();
let render_rect = element.render_rect(&visible_area, self.scale_factor as f32);
// Apply blur effect
if let Some(blur_radius) = effect_state.blur {
let style = element.style();

let image_filter = blur(
(
blur_radius * self.scale_factor as f32,
blur_radius * self.scale_factor as f32,
),
None,
None,
render_rect.rect(),
);
if let Some(image_filter) = image_filter {
let rec = SaveLayerRec::default()
.bounds(render_rect.rect())
.backdrop(&image_filter);
if style.corner_radius.is_round() {
self.canvas.clip_rrect(render_rect, ClipOp::Intersect, true);
self.canvas.save_layer(&rec);
} else {
self.canvas.save_layer(&rec);
}
}
}
}

self.canvas.restore_to_count(layer);
}
}
Expand Down
Loading