From 2558057e9f39d2cfa7685319241f21362daea724 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Tue, 12 Mar 2024 00:09:54 +1300 Subject: [PATCH] Use mix instead of interpolate --- rog-control-center/translations/en/rog-control-center.po | 2 +- rog-control-center/ui/widgets/colour_picker.slint | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 9fafa5b4..1490a8f3 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-11 10:27+0000\n" +"POT-Creation-Date: 2024-03-11 11:08+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 315edf21..2f8a580b 100644 --- a/rog-control-center/ui/widgets/colour_picker.slint +++ b/rog-control-center/ui/widgets/colour_picker.slint @@ -1,9 +1,11 @@ import { Palette, Slider, HorizontalBox, Button, LineEdit } from "std-widgets.slint"; export component ColourSlider inherits VerticalLayout { - in-out property enabled; spacing: 10px; + in-out property enabled; property hex: "#FF0000"; + in-out property c1value<=> c1.value; + in-out property c2value<=> c2.value; property base_colour: Colors.red; in-out property final_colour: Colors.red; in-out property colourbox: final_colour; @@ -11,8 +13,7 @@ export component ColourSlider inherits VerticalLayout { // required callback set_hex_from_colour(color) -> string; callback released(); - in-out property c1value<=> c1.value; - in-out property c2value<=> c2.value; + property <[color]> base_colours: [ hsv(0, 1, 1), hsv(10, 1, 1), @@ -150,6 +151,7 @@ export component ColourSlider inherits VerticalLayout { border-radius: 7px; border-color: Palette.border; background <=> root.colourbox; + } } }