fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-29 09:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace alpha with luminance

Browse Source
This commit is contained in:
mtvare6
2025-07-12 04:13:09 +05:30
parent 382b1e35d4
commit 89d6c970d4
1 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/gsvg-renderer/src/renderer.rs
+16 -39
View File
@@ -273,17 +273,7 @@ impl GraphicElementRendered for GraphicGroupTable {
} }
if let Some(mask) = instance.mask { if let Some(mask) = instance.mask {
let uuid = generate_uuid(); attributes.push_mask(mask, render_params.for_clipper());
let mask_type = if mask.can_reduce_to_clip_path() { MaskType::Clip } else { MaskType::Mask };
let mut svg = SvgRender::new();
mask.render_svg(&mut svg, &render_params.for_clipper());
write!(&mut attributes.0.svg_defs, r##"{}"##, svg.svg_defs).unwrap();
mask_type.write_to_defs(&mut attributes.0.svg_defs, uuid, svg.svg.to_svg_string());
let id = format!("mask-{}", uuid);
let selector = format!("url(#{id})");
attributes.push(mask_type.to_attribute(), selector);
} }
}, },
|render| { |render| {
@@ -534,17 +524,7 @@ impl GraphicElementRendered for VectorDataTable {
} }
if let Some(mask) = instance.mask { if let Some(mask) = instance.mask {
let uuid = generate_uuid(); attributes.push_mask(mask, render_params.for_clipper());
let mask_type = if mask.can_reduce_to_clip_path() { MaskType::Clip } else { MaskType::Mask };
let mut svg = SvgRender::new();
mask.render_svg(&mut svg, &render_params.for_clipper());
write!(&mut attributes.0.svg_defs, r##"{}"##, svg.svg_defs).unwrap();
mask_type.write_to_defs(&mut attributes.0.svg_defs, uuid, svg.svg.to_svg_string());
let id = format!("mask-{}", uuid);
let selector = format!("url(#{id})");
attributes.push(mask_type.to_attribute(), selector);
} }
attributes.push_val(fill_and_stroke); attributes.push_val(fill_and_stroke);
@@ -1046,23 +1026,7 @@ impl GraphicElementRendered for RasterDataTable<CPU> {
// Unlike path and g elements, the mask attribute of image element is broken and // Unlike path and g elements, the mask attribute of image element is broken and
// behaves differently across different browsers. And so we use g to have it work correctly. // behaves differently across different browsers. And so we use g to have it work correctly.
if let Some(mask) = instance.mask { if let Some(mask) = instance.mask {
render.parent_tag( render.parent_tag("g", |attributes| attributes.push_mask(mask, render_params.for_clipper()), render_image);
"g",
|attributes| {
let uuid = generate_uuid();
let mask_type = if mask.can_reduce_to_clip_path() { MaskType::Clip } else { MaskType::Mask };
let mut svg = SvgRender::new();
mask.render_svg(&mut svg, &render_params.for_clipper());
write!(&mut attributes.0.svg_defs, r##"{}"##, svg.svg_defs).unwrap();
mask_type.write_to_defs(&mut attributes.0.svg_defs, uuid, svg.svg.to_svg_string());
let id = format!("mask-{}", uuid);
let selector = format!("url(#{id})");
attributes.push(mask_type.to_attribute(), selector);
},
render_image,
);
} else { } else {
render_image(render) render_image(render)
} }
@@ -1383,4 +1347,17 @@ impl SvgRenderAttrs<'_> {
pub fn push_val(&mut self, value: impl Into<SvgSegment>) { pub fn push_val(&mut self, value: impl Into<SvgSegment>) {
self.0.svg.push(value.into()); self.0.svg.push(value.into());
} }
fn push_mask(&mut self, mask: &GraphicElement, render_params: RenderParams) {
let uuid = generate_uuid();
let mut svg = SvgRender::new();
mask.render_svg(&mut svg, &render_params);
let id = format!("mask-{}", uuid);
write!(&mut self.0.svg_defs, r##"{}"##, svg.svg_defs).unwrap();
write!(&mut self.0.svg_defs, r##"<mask id="{id}" mask-type="lumninance">{}</mask>"##, svg.svg.to_svg_string()).unwrap();
let selector = format!("url(#{id})");
self.push("mask", selector);
}
} }