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

Fix outline rendering mode to draw shapes as black or white based on contrast with their artboard's color (#3724)

Browse Source 
* contrast

* Update

* error corrected

* changes

* Fix

* fix-2

* cleanup-2

* Formatting

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Kulcode
2026-02-17 05:08:12 +05:30
committed by GitHub
parent 20e12edd45
commit ed20f4ac9b
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
node-graph/libraries/rendering/src/renderer.rs
View File

@@ -182,6 +182,7 @@ pub struct RenderParams {
pub alignment_parent_transform: Option<DAffine2>,
pub aligned_strokes: bool,
pub override_paint_order: bool,
pub artboard_background: Option<Color>,
}
impl Hash for RenderParams {
@@ -198,6 +199,7 @@ impl Hash for RenderParams {
}
self.aligned_strokes.hash(state);
self.override_paint_order.hash(state);
self.artboard_background.hash(state);
}
}
@@ -235,6 +237,26 @@ fn max_scale(transform: DAffine2) -> f64 {
(sx + sy).sqrt()
}
pub fn black_or_white_for_best_contrast(background: Option<Color>) -> Color {
let Some(bg) = background else { return core_types::consts::LAYER_OUTLINE_STROKE_COLOR };
let alpha = bg.a();
// Un-premultiply, then convert to gamma sRGB
let srgb = if alpha > f32::EPSILON {
Color::from_rgbaf32_unchecked(bg.r() / alpha, bg.g() / alpha, bg.b() / alpha, alpha).to_gamma_srgb()
} else {
Color::TRANSPARENT
};
// Composite over black in sRGB space, then convert back to linear for luminance
let composited = Color::from_rgbaf32_unchecked(srgb.r() * alpha, srgb.g() * alpha, srgb.b() * alpha, 1.).to_linear_srgb();
let threshold = (1.05 * 0.05f32).sqrt() - 0.05;
if composited.luminance_srgb() > threshold { Color::BLACK } else { Color::WHITE }
}
pub fn to_transform(transform: DAffine2) -> usvg::Transform {
let cols = transform.to_cols_array();
usvg::Transform::from_row(cols[0] as f32, cols[1] as f32, cols[2] as f32, cols[3] as f32, cols[4] as f32, cols[5] as f32)
@@ -441,7 +463,9 @@ impl Render for Artboard {
},
// Artwork content
|render| {
self.content.render_svg(render, render_params);
let mut render_params = render_params.clone();
render_params.artboard_background = Some(self.background);
self.content.render_svg(render, &render_params);
},
);
}
@@ -463,7 +487,9 @@ impl Render for Artboard {
}
// Since the content's transform is right multiplied in when rendering the content, we just need to right multiply by the artboard offset here.
let child_transform = transform * DAffine2::from_translation(self.location.as_dvec2());
self.content.render_to_vello(scene, child_transform, context, render_params);
let mut render_params = render_params.clone();
render_params.artboard_background = Some(self.background);
self.content.render_to_vello(scene, child_transform, context, &render_params);
if self.clip {
scene.pop_layer();
}
@@ -882,7 +908,7 @@ impl Render for Table<Vector> {
}
fn render_to_vello(&self, scene: &mut Scene, parent_transform: DAffine2, _context: &mut RenderContext, render_params: &RenderParams) {
use core_types::consts::{LAYER_OUTLINE_STROKE_COLOR, LAYER_OUTLINE_STROKE_WEIGHT};
use core_types::consts::LAYER_OUTLINE_STROKE_WEIGHT;
use graphic_types::vector_types::vector::style::{GradientType, StrokeCap, StrokeJoin};
use vello::kurbo::{Cap, Join};
use vello::peniko;
@@ -1066,12 +1092,9 @@ impl Render for Table<Vector> {
dash_pattern: Default::default(),
dash_offset: 0.,
};
let outline_color = peniko::Color::new([
LAYER_OUTLINE_STROKE_COLOR.r(),
LAYER_OUTLINE_STROKE_COLOR.g(),
LAYER_OUTLINE_STROKE_COLOR.b(),
LAYER_OUTLINE_STROKE_COLOR.a(),
]);
let outline_color = black_or_white_for_best_contrast(render_params.artboard_background);
let outline_color = peniko::Color::new([outline_color.r(), outline_color.g(), outline_color.b(), outline_color.a()]);
scene.stroke(&outline_stroke, kurbo::Affine::new(element_transform.to_cols_array()), outline_color, None, &path);
}