dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-06-17 05:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing infintite loop in ColorSchemeBuilder

Browse source 
`generate_error` can technically fail to generate a contrasting color if
the primary color is desaturated too much. This is beacuse we never
increase the saturation.

This change makes the color scheme builder stop one iteration shy of a
full circle.
This commit is contained in:
Jonathan Johnson 2024-01-11 14:58:27 -08:00
parent bd13003cbb
commit e2f8e04670
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/styles.rs
View file

@ -13,6 +13,7 @@ use std::sync::Arc;
use ahash::AHashMap;
use figures::units::{Lp, Px, UPx};
use figures::{Fraction, IntoSigned, IntoUnsigned, Rect, ScreenScale, Size, Zero};
use intentional::Cast;
pub use kludgine::cosmic_text::{FamilyOwned, Style, Weight};
pub use kludgine::shapes::CornerRadii;
pub use kludgine::Color;
@ -2283,11 +2284,15 @@ impl ColorSchemeBuilder {
fn generate_error(&self, secondary: ColorSource, tertiary: ColorSource) -> ColorSource {
let mut error = ColorSource::new(30., self.primary.saturation);
while [self.primary, secondary, tertiary]
.iter()
.any(|c| c.contrast_between(error) < 0.10)
let shift_degrees = self.hue_shift.into_positive_degrees().ceil().cast::<u32>();
let mut iters_left = (360 - (shift_degrees - 1)) / shift_degrees;
while iters_left > 0
&& [self.primary, secondary, tertiary]
.iter()
.any(|c| c.contrast_between(error) < 0.20)
{
error.hue -= self.hue_shift;
iters_left -= 1;
}
error