From 94ee4e1915d05807c041c8770d27c6e1ec41ec05 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Tue, 26 Aug 2025 15:13:15 -0400 Subject: [PATCH] theme: fix disabled button --- cosmic-theme/src/composite.rs | 14 ++++---------- cosmic-theme/src/model/derivation.rs | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/cosmic-theme/src/composite.rs b/cosmic-theme/src/composite.rs index c30469b..66d7ac9 100644 --- a/cosmic-theme/src/composite.rs +++ b/cosmic-theme/src/composite.rs @@ -4,16 +4,10 @@ use palette::Srgba; pub fn over, B: Into>(a: A, b: B) -> Srgba { let a = a.into(); let b = b.into(); - let o_a = (alpha_over(a.alpha, b.alpha)).max(0.0).min(1.0); - let o_r = (c_over(a.red, b.red, a.alpha, b.alpha, o_a)) - .max(0.0) - .min(1.0); - let o_g = (c_over(a.green, b.green, a.alpha, b.alpha, o_a)) - .max(0.0) - .min(1.0); - let o_b = (c_over(a.blue, b.blue, a.alpha, b.alpha, o_a)) - .max(0.0) - .min(1.0); + let o_a = (alpha_over(a.alpha, b.alpha)).clamp(0.0, 1.0); + let o_r = (c_over(a.red, b.red, a.alpha, b.alpha, o_a)).clamp(0.0, 1.0); + let o_g = (c_over(a.green, b.green, a.alpha, b.alpha, o_a)).clamp(0.0, 1.0); + let o_b = (c_over(a.blue, b.blue, a.alpha, b.alpha, o_a)).clamp(0.0, 1.0); Srgba::new(o_r, o_g, o_b, o_a) } diff --git a/cosmic-theme/src/model/derivation.rs b/cosmic-theme/src/model/derivation.rs index bcc4990..2944af4 100644 --- a/cosmic-theme/src/model/derivation.rs +++ b/cosmic-theme/src/model/derivation.rs @@ -194,8 +194,8 @@ impl Component { focus: accent, divider: if is_high_contrast { on_50 } else { on_20 }, on: on_component, - disabled: over(base_50, base), - on_disabled: over(on_50, base), + disabled: base_50, + on_disabled: on_50, border, disabled_border, }