From 9b6f4ace148e05ad0747ec996222db8dddccfc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sun, 16 Feb 2025 11:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=94=9F=E6=88=90=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E9=A2=9C=E8=89=B2=E6=97=B6=E5=AD=98=E5=9C=A8=E7=9A=84?= =?UTF-8?q?=E6=97=A0=E9=99=90=E5=BE=AA=E7=8E=AF=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schemes/material_design_3_dynamic/dynamic_color.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/color-module/src/schemes/material_design_3_dynamic/dynamic_color.rs b/color-module/src/schemes/material_design_3_dynamic/dynamic_color.rs index 2ba9ddb..83abc22 100644 --- a/color-module/src/schemes/material_design_3_dynamic/dynamic_color.rs +++ b/color-module/src/schemes/material_design_3_dynamic/dynamic_color.rs @@ -63,6 +63,10 @@ impl DynamicColor { } } + pub fn tone(&self, scheme: &DynamicScheme) -> f32 { + (self.tone)(scheme) + } + pub fn get_lch(&self, scheme: &DynamicScheme) -> Lch { let tone = self.get_tone(scheme); (self.palette)(scheme).tone(tone) @@ -88,14 +92,14 @@ impl DynamicColor { let n_contrast = (nearer.contrast_curve.as_ref().unwrap()).get(scheme.contrast_level); let f_contrast = (farther.contrast_curve.as_ref().unwrap()).get(scheme.contrast_level); - let n_initial_tone = nearer.get_tone(scheme); + let n_initial_tone = nearer.tone(scheme); let mut n_tone = if super::contrast::ratio_of_tones(bg_tone, n_initial_tone) >= n_contrast { n_initial_tone } else { foreground_tone(bg_tone, n_contrast) }; - let f_initial_tone = farther.get_tone(scheme); + let f_initial_tone = farther.tone(scheme); let mut f_tone = if super::contrast::ratio_of_tones(bg_tone, f_initial_tone) >= f_contrast { f_initial_tone