From 9006a3b19ab7ef480c33e9d85fd87ca70d9d3236 Mon Sep 17 00:00:00 2001 From: Nigel Breslaw Date: Wed, 9 Oct 2024 15:18:48 +0300 Subject: [PATCH 1/3] Replace broken svg --- examples/fancy-switches/DarkModeSwitch.slint | 52 +++++++++---------- examples/fancy-switches/images/line.png | Bin 0 -> 267 bytes examples/fancy-switches/images/line.svg | 1 - examples/fancy-switches/images/line2.svg | 1 - 4 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 examples/fancy-switches/images/line.png delete mode 100644 examples/fancy-switches/images/line.svg delete mode 100644 examples/fancy-switches/images/line2.svg diff --git a/examples/fancy-switches/DarkModeSwitch.slint b/examples/fancy-switches/DarkModeSwitch.slint index 5fe15e0efee..b9100552c64 100644 --- a/examples/fancy-switches/DarkModeSwitch.slint +++ b/examples/fancy-switches/DarkModeSwitch.slint @@ -1,36 +1,36 @@ // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: MIT -component SunRayThick { +export component RayThick { + in-out property colorize <=> i.colorize; + in-out property rotation <=> i.rotation-angle; width: 0px; height: 0px; - in property rotation <=> i.rotation-angle; - in property color <=> i.colorize; - Rectangle { - property sizeMultiplyer: 0.7px; - i := Image { - source: @image-url("images/line2.svg"); - width: self.source.width * sizeMultiplyer * 0.8; - height: self.source.height * sizeMultiplyer; - colorize: red; - } + + i := Image { + property sizeMultiplyer: 0.3px; + width: self.source.width * sizeMultiplyer * 0.8; + height: self.source.height * sizeMultiplyer * 1; + source: @image-url("images/line.png"); } + } -component SunRayThin { +export component RayThin { + in-out property colorize <=> i.colorize; + in-out property rotation <=> i.rotation-angle; width: 0px; height: 0px; - in property rotation <=> i.rotation-angle; - in property color <=> i.colorize; - Rectangle { - i := Image { - property sizeMultiplyer: 0.6px; - source: @image-url("images/line2.svg"); - width: self.source.width * sizeMultiplyer * 0.6; - height: self.source.height * sizeMultiplyer; - } + + i := Image { + property sizeMultiplyer: 0.25px; + width: self.source.width * sizeMultiplyer * 0.6; + height: self.source.height * sizeMultiplyer; + source: @image-url("images/line.png"); } -} + +} + component SunIcon { property rays: 4; @@ -51,17 +51,17 @@ component SunIcon { border-color: root.color; border-width: 5px; } - for i in rays: SunRayThick { + for i in rays: RayThick { property angle: i * 360deg / rays; - color: root.color; + colorize: root.color; x: (sun-size / 2 + gap) * scale * angle.cos(); y: (sun-size / 2 + gap) * scale * angle.sin(); rotation: angle; } - for i in rays: SunRayThin { + for i in rays: RayThin { property angle: i * (360deg / rays) + 45deg; - color: root.color; + colorize: root.color; x: (sun-size / 2 + gap) * angle.cos(); y: (sun-size / 2 + gap) * angle.sin(); rotation: angle; diff --git a/examples/fancy-switches/images/line.png b/examples/fancy-switches/images/line.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fc9ed76c5ae4a43c2c4cb22ac7e968e900a5b9 GIT binary patch literal 267 zcmV+m0rdWfP)opAf^x!?A4-`wKt zc=wMmEka}nD>%a&Gyx@CUqrwR~|7I|A zPBx?o3sCZTZ=2DF8z*W|2ZH&nGhvqI@1%}Y9FM{rJaxke9G_5tT \ No newline at end of file diff --git a/examples/fancy-switches/images/line2.svg b/examples/fancy-switches/images/line2.svg deleted file mode 100644 index a3d43673451..00000000000 --- a/examples/fancy-switches/images/line2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 799b8931937ccd0481d75823da29112b6946c931 Mon Sep 17 00:00:00 2001 From: Nigel Breslaw Date: Wed, 9 Oct 2024 15:35:33 +0300 Subject: [PATCH 2/3] Fix --- examples/fancy-switches/DarkModeSwitch.slint | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/fancy-switches/DarkModeSwitch.slint b/examples/fancy-switches/DarkModeSwitch.slint index b9100552c64..f89bb83ed38 100644 --- a/examples/fancy-switches/DarkModeSwitch.slint +++ b/examples/fancy-switches/DarkModeSwitch.slint @@ -8,9 +8,9 @@ export component RayThick { height: 0px; i := Image { - property sizeMultiplyer: 0.3px; - width: self.source.width * sizeMultiplyer * 0.8; - height: self.source.height * sizeMultiplyer * 1; + property sizeMultiplier: 0.3px; + width: self.source.width * sizeMultiplier * 0.8; + height: self.source.height * sizeMultiplier; source: @image-url("images/line.png"); } @@ -23,9 +23,9 @@ export component RayThin { height: 0px; i := Image { - property sizeMultiplyer: 0.25px; - width: self.source.width * sizeMultiplyer * 0.6; - height: self.source.height * sizeMultiplyer; + property sizeMultiplier: 0.25px; + width: self.source.width * sizeMultiplier * 0.6; + height: self.source.height * sizeMultiplier; source: @image-url("images/line.png"); } From 5e196b0843dfc7d3a2bdd138ca573cdea7e8be81 Mon Sep 17 00:00:00 2001 From: Nigel Breslaw Date: Wed, 9 Oct 2024 15:38:01 +0300 Subject: [PATCH 3/3] No need to export --- examples/fancy-switches/DarkModeSwitch.slint | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/fancy-switches/DarkModeSwitch.slint b/examples/fancy-switches/DarkModeSwitch.slint index f89bb83ed38..d73b8bf15f5 100644 --- a/examples/fancy-switches/DarkModeSwitch.slint +++ b/examples/fancy-switches/DarkModeSwitch.slint @@ -1,7 +1,7 @@ // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: MIT -export component RayThick { +component RayThick { in-out property colorize <=> i.colorize; in-out property rotation <=> i.rotation-angle; width: 0px; @@ -16,7 +16,7 @@ export component RayThick { } -export component RayThin { +component RayThin { in-out property colorize <=> i.colorize; in-out property rotation <=> i.rotation-angle; width: 0px;