mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-21 18:04:03 +01:00
Color Wheel: the slider rows show a color outside sRGB clipped to sRGB
A fill whose display RGB lies outside 0 to 1 (an RGB fill given as [1.6, 0.2, -0.4], for example) showed in the HSL and OKLCH rows with the components of the unclipped color, so an edit started from a color other than the one the panel shows. The rows now take their values from the display color clipped to sRGB.
This commit is contained in:
1 parent
88cac70e8b
commit
e6a4fbc523
2 files changed
+28
-4
No files matched your search
@@ -581,7 +581,13 @@ fn replaced(app: &VectorcraftApp, tgt: &Target, behind: bool) -> Option<Color> {
|
||||
/// then displayed as the sRGB `shown`: `lch` while `c` still displays as `shown` (a chroma past the
|
||||
/// gamut and the hue of a gray stay), else `c`'s own.
|
||||
pub(crate) fn remembered_oklch(cms: &Cms, c: &Color, shown: [f32; 3], lch: [f64; 3]) -> [f64; 3] {
|
||||
if cms.display_rgb(c) == shown { lch } else { oklab::to_oklch(cms.display_rgb(c)) }
|
||||
if cms.display_rgb(c) == shown { lch } else { oklab::to_oklch(clipped_rgb(cms, c)) }
|
||||
}
|
||||
|
||||
/// The display sRGB of `c` through `cms` clipped to sRGB: the color the slider rows show and edit
|
||||
/// for a color outside sRGB.
|
||||
fn clipped_rgb(cms: &Cms, c: &Color) -> [f32; 3] {
|
||||
cms.display_rgb(c).map(|v| v.clamp(0.0, 1.0))
|
||||
}
|
||||
|
||||
/// The color a track shows at OKLCH `lch`: the color itself inside sRGB, and outside it dimmed.
|
||||
@@ -621,7 +627,7 @@ pub(crate) fn oklch_rows(app: &VectorcraftApp, ui: &mut Ui, tgt: &Target, color:
|
||||
let enabled = color.is_some() && cms.rgb_is_srgb();
|
||||
let lch = match (color, recall::<[f64; 3]>(app, ui, OKLCH_MEMORY, tgt, color, cms)) {
|
||||
(Some(c), Some((shown, lch))) => remembered_oklch(cms, &c, shown, lch),
|
||||
(Some(c), _) => oklab::to_oklch(cms.display_rgb(&c)),
|
||||
(Some(c), _) => oklab::to_oklch(clipped_rgb(cms, &c)),
|
||||
(None, _) => [0.0; 3],
|
||||
};
|
||||
// Each row: its letter, its screen-reader name, the end of its range and the field's suffix.
|
||||
@@ -707,7 +713,7 @@ const TRACK_SAMPLES: usize = 128;
|
||||
/// then displayed as the sRGB `shown`: `hsl` while `c` still displays as `shown` (the hue of a gray
|
||||
/// and the saturation of black and white stay), else `c`'s own.
|
||||
pub(crate) fn remembered_hsl(cms: &Cms, c: &Color, shown: [f32; 3], hsl: [f32; 3]) -> [f32; 3] {
|
||||
if cms.display_rgb(c) == shown { hsl } else { rgb_to_hsl(cms.display_rgb(c)) }
|
||||
if cms.display_rgb(c) == shown { hsl } else { rgb_to_hsl(clipped_rgb(cms, c)) }
|
||||
}
|
||||
|
||||
/// The color a track shows at HSL `hsl`.
|
||||
@@ -725,7 +731,7 @@ pub(crate) fn hsl_rows(app: &VectorcraftApp, ui: &mut Ui, tgt: &Target, color: O
|
||||
let enabled = color.is_some();
|
||||
let hsl = match (color, recall::<[f32; 3]>(app, ui, HSL_MEMORY, tgt, color, cms)) {
|
||||
(Some(c), Some((shown, hsl))) => remembered_hsl(cms, &c, shown, hsl),
|
||||
(Some(c), _) => rgb_to_hsl(cms.display_rgb(&c)),
|
||||
(Some(c), _) => rgb_to_hsl(clipped_rgb(cms, &c)),
|
||||
(None, _) => [0.0; 3],
|
||||
};
|
||||
// Each row: its letter, its screen-reader name, the end of its range and the field's suffix. The
|
||||
|
||||
@@ -1095,6 +1095,24 @@ fn a_hue_on_a_gray_color_leaves_its_paint_gray() {
|
||||
}
|
||||
}
|
||||
|
||||
/// For a fill outside sRGB, the HSL and OKLCH rows show the components of its display color
|
||||
/// clipped to sRGB, the color the panel shows, not of the unclipped one.
|
||||
#[test]
|
||||
fn the_rows_show_a_color_outside_srgb_clipped_to_srgb() {
|
||||
let rgb = json!([1.6, 0.2, -0.4]);
|
||||
let raw = cms::active().display_rgb(&fill(&app(rgb.clone())));
|
||||
let clipped = raw.map(|v| v.clamp(0.0, 1.0));
|
||||
assert_ne!(raw, clipped, "the fill lies outside sRGB");
|
||||
let want_hsl = (f64::from(vectorcraft_color::rgb_to_hsl(clipped)[2]) * 100.0).round();
|
||||
assert_ne!(want_hsl, (f64::from(vectorcraft_color::rgb_to_hsl(raw)[2]) * 100.0).round(), "the unclipped lightness differs");
|
||||
let h = hsl_harness(app(rgb.clone()));
|
||||
assert_eq!(oklch_slider(&h, "HSL Lightness").accesskit_node().numeric_value(), Some(want_hsl));
|
||||
let want_l = (vectorcraft_color::oklab::to_oklch(clipped)[0] * 100.0).round();
|
||||
assert_ne!(want_l, (vectorcraft_color::oklab::to_oklch(raw)[0] * 100.0).round(), "the unclipped OKLCH lightness differs");
|
||||
let h = oklch_harness(app(rgb));
|
||||
assert_eq!(oklch_slider(&h, "Lightness").accesskit_node().numeric_value(), Some(want_l));
|
||||
}
|
||||
|
||||
/// The hue given to a gray is dropped once the panel shows another color, so the same gray applied
|
||||
/// again later shows its own hue, 0°.
|
||||
#[test]
|
||||
|
||||
Reference in new issue
Block a user