diff --git a/rog-control-center/src/ui_setup.rs b/rog-control-center/src/ui_setup.rs index 42f273fa..4763fc41 100644 --- a/rog-control-center/src/ui_setup.rs +++ b/rog-control-center/src/ui_setup.rs @@ -431,8 +431,7 @@ fn rgb_hi(colour: Color) -> (f32, f32) { } }; let h2 = ((h * 60.0) + 360.0) % 360.0; - let i = 0.299 * c1.red + 0.587 * c1.green + 0.114 * c1.blue; - + let i = (c1.red + c1.green + c1.blue) / 3.0; (h2, i) } @@ -458,7 +457,6 @@ fn setup_aura_page(ui: &MainWindow, _states: Arc>) { green: c1.green * f, blue: c1.blue * f, }; - // dbg!(rgb_hi(c.into())); c.into() }); diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 2b04b657..79f1f66c 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-03-02 23:56+0000\n" +"POT-Creation-Date: 2024-03-02 23:57+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/pages/aura.slint b/rog-control-center/ui/pages/aura.slint index e6fb1fde..c2164dcf 100644 --- a/rog-control-center/ui/pages/aura.slint +++ b/rog-control-center/ui/pages/aura.slint @@ -152,7 +152,7 @@ export component PageAura inherits VerticalLayout { } HorizontalBox { - c1 := ColourSlider { + ColourSlider { final_colour <=> AuraPageData.color1; colourbox <=> AuraPageData.colorbox1; set_hex_from_colour(c1) => { @@ -189,7 +189,7 @@ export component PageAura inherits VerticalLayout { } HorizontalBox { - c2 := ColourSlider { + ColourSlider { final_colour <=> AuraPageData.color2; colourbox <=> AuraPageData.colorbox2; set_hex_from_colour(c1) => { diff --git a/rog-control-center/ui/widgets/colour_picker.slint b/rog-control-center/ui/widgets/colour_picker.slint index a3b754c8..b829722d 100644 --- a/rog-control-center/ui/widgets/colour_picker.slint +++ b/rog-control-center/ui/widgets/colour_picker.slint @@ -52,7 +52,7 @@ export component ColourSlider inherits VerticalLayout { callback external_colour_change(); external_colour_change => { c1.value = 13 * (root.set_hue(root.final_colour) / 360); - c2.value = 12 * (root.set_bright(root.final_colour) / 0.86); + c2.value = 11 - (11 * (root.set_bright(root.final_colour) / 0.5)); root.set_base_colour(); } Rectangle { @@ -92,7 +92,7 @@ export component ColourSlider inherits VerticalLayout { hex = set_hex_from_colour(final_colour); } init => { - self.value = 12 * (root.set_bright(root.final_colour) / 0.86); + self.value = 12 - (12 * (root.set_bright(root.final_colour) / 0.5)); root.set_base_colour(); } }