From b8bc1a01b3560e7e60d1cd11199d274a3139b46c Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 17 Apr 2024 12:46:36 +1200 Subject: [PATCH] Fix colour hex in gui --- Cargo.lock | 30 +++++++++---------- rog-control-center/src/ui/setup_aura.rs | 8 +++++ .../translations/en/rog-control-center.po | 2 +- .../ui/widgets/colour_picker.slint | 10 +++++-- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad952092..53433cb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,7 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "asusctl" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "asusd", "cargo-husky", @@ -174,14 +174,14 @@ dependencies = [ [[package]] name = "asusd" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "concat-idents", "config-traits", "dmi_id", "env_logger", - "futures-lite 2.3.0", + "futures-lite 1.13.0", "inotify", "log", "logind-zbus", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "config-traits", @@ -916,7 +916,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "log", @@ -1026,7 +1026,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpuctl" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" [[package]] name = "cpufeatures" @@ -1236,7 +1236,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "log", "udev 0.8.0", @@ -3714,7 +3714,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "asusd", "betrayer", @@ -3753,7 +3753,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "dmi_id", @@ -3770,7 +3770,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "dmi_id", @@ -3784,7 +3784,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "asusd", "cargo-husky", @@ -3798,7 +3798,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "concat-idents", @@ -3815,7 +3815,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "log", @@ -3829,7 +3829,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "glam", "log", @@ -3840,7 +3840,7 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.0.0-alpha3" +version = "6.0.0-alpha4" dependencies = [ "cargo-husky", "dmi_id", diff --git a/rog-control-center/src/ui/setup_aura.rs b/rog-control-center/src/ui/setup_aura.rs index 21b170e1..a418adfb 100644 --- a/rog-control-center/src/ui/setup_aura.rs +++ b/rog-control-center/src/ui/setup_aura.rs @@ -12,6 +12,14 @@ use crate::{ fn decode_hex(s: &str) -> RgbaColor { let s = s.trim_start_matches('#'); + if s.len() < 6 { + return RgbaColor { + alpha: 255, + red: 0, + green: 0, + blue: 0, + }; + } let c: Vec = (0..s.len()) .step_by(2) .map(|i| u8::from_str_radix(&s[i..i + 2], 16).unwrap_or(164)) diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 49cb602b..0a954c54 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-04-16 23:52+0000\n" +"POT-Creation-Date: 2024-04-16 23:55+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/rog-control-center/ui/widgets/colour_picker.slint b/rog-control-center/ui/widgets/colour_picker.slint index 9cbaf7f9..e5a58598 100644 --- a/rog-control-center/ui/widgets/colour_picker.slint +++ b/rog-control-center/ui/widgets/colour_picker.slint @@ -66,11 +66,11 @@ export component ColourSlider inherits VerticalLayout { blend_lightness(base_colour, 0.1), blend_lightness(base_colour, 0.0) ]; - function blend_lightness(c1: color, f: float) -> color { + function blend_lightness(c1: color,f: float) -> color { rgb(c1.red * f, c1.green * f, c1.blue * f) } // - function set_base_colour() { + function set_base_colour(){ root.base_colour = base_colours[c1.value].mix(base_colours[c1.value + 1], c1.value - Math.floor(c1.value)); root.final_colour = blend_lightness(base_colour, ((base_shade.length - c2.value) / base_shade.length)); root.colourbox = root.final_colour; @@ -141,9 +141,13 @@ export component ColourSlider inherits VerticalLayout { enabled <=> root.enabled; // width: 50%; text <=> root.hex; - edited => { + accepted => { base_colour = hex_to_colour(self.text); root.colourbox = base_colour; + root.final_colour = base_colour; + root.colourbox = root.final_colour; + root.external_colour_change(); + root.released(); } }