From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02

---
 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 84f44bd..1a26758 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -157,10 +157,12 @@
             framePickerBack.Y = btnFromFoorAndRoom.Bottom + Application.GetRealHeight(1);
             framePickerBack.Width = Application.GetMinRealAverage(216);
             framePickerBack.Height = Application.GetMinRealAverage(216);
+            //framePickerBack.BackgroundColor = 0xFFFF0000;
             controlView.AddChidren(framePickerBack);
 
             colorPicker = new ColorPicker()
             {
+                Gravity = Gravity.Center,
                 ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
             };
             framePickerBack.AddChidren(colorPicker);
@@ -176,10 +178,17 @@
             //};
 
             //鐧界偣鎺т欢
-            this.btnWhiteRound = new Button();
-            btnWhiteRound.Width = Application.GetRealWidth(24);
-            btnWhiteRound.Height = Application.GetRealWidth(24);
-            btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
+            var diameter = Application.GetRealWidth(12);
+            this.btnWhiteRound = new Button()
+            {
+                Width = diameter,
+                Height = diameter,
+                Radius = (uint)Application.GetRealWidth(6),
+                BorderWidth = (uint)Application.GetRealWidth(1),
+                BorderColor = CSS_Color.MainBackgroundColor,
+                Enable = false,
+            };
+            //btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
             btnWhiteRound.Visible = false;
             framePickerBack.AddChidren(btnWhiteRound);
 
@@ -349,8 +358,6 @@
                 DriverLayer.Control.Ins.SendReadCommand(function);
             })
             { IsBackground = true }.Start();
-
-
 
             new System.Threading.Thread(() => {
                 while (true)

--
Gitblit v1.8.0