gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor adjust to rgb bright slider

Browse Source
This commit is contained in:
Luke D. Jones
2024-03-03 13:30:46 +13:00
parent 3da848d131
commit b798cf6a4e
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rog-control-center/src/ui_setup.rs
View File

@@ -431,8 +431,7 @@ fn rgb_hi(colour: Color) -> (f32, f32) {
} }
}; };
let h2 = ((h * 60.0) + 360.0) % 360.0; 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) (h2, i)
} }
@@ -458,7 +457,6 @@ fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
green: c1.green * f, green: c1.green * f,
blue: c1.blue * f, blue: c1.blue * f,
}; };
// dbg!(rgb_hi(c.into()));
c.into() c.into()
}); });

2
rog-control-center/translations/en/rog-control-center.po
View File

@@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

4
rog-control-center/ui/pages/aura.slint
View File

@@ -152,7 +152,7 @@ export component PageAura inherits VerticalLayout {
} }
HorizontalBox { HorizontalBox {
c1 := ColourSlider { ColourSlider {
final_colour <=> AuraPageData.color1; final_colour <=> AuraPageData.color1;
colourbox <=> AuraPageData.colorbox1; colourbox <=> AuraPageData.colorbox1;
set_hex_from_colour(c1) => { set_hex_from_colour(c1) => {
@@ -189,7 +189,7 @@ export component PageAura inherits VerticalLayout {
} }
HorizontalBox { HorizontalBox {
c2 := ColourSlider { ColourSlider {
final_colour <=> AuraPageData.color2; final_colour <=> AuraPageData.color2;
colourbox <=> AuraPageData.colorbox2; colourbox <=> AuraPageData.colorbox2;
set_hex_from_colour(c1) => { set_hex_from_colour(c1) => {

4
rog-control-center/ui/widgets/colour_picker.slint
View File

@@ -52,7 +52,7 @@ export component ColourSlider inherits VerticalLayout {
callback external_colour_change(); callback external_colour_change();
external_colour_change => { external_colour_change => {
c1.value = 13 * (root.set_hue(root.final_colour) / 360); 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(); root.set_base_colour();
} }
Rectangle { Rectangle {
@@ -92,7 +92,7 @@ export component ColourSlider inherits VerticalLayout {
hex = set_hex_from_colour(final_colour); hex = set_hex_from_colour(final_colour);
} }
init => { 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(); root.set_base_colour();
} }
} }