From dcf60777c9346ff058f06298d03173f0c53d1902 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 20:42:15 +0800
Subject: [PATCH] 20201216-4
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index 0878e07..0162525 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -110,10 +110,6 @@
};
controlView.AddChidren(btnFromFoorAndRoom);
- if(light.redColor==0&&light.greenColor == 0&& light.blueColor == 0)
- {
- }
-
btnCurColor = new Button()
{
X = Application.GetRealWidth(16),
@@ -123,13 +119,9 @@
Radius = (uint)Application.GetMinRealAverage(8),
BorderColor = CSS_Color.PromptingColor2,
BorderWidth = 1,
- BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor)
+ BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor())
};
- if (light.redColor == 0 && light.greenColor == 0 && light.blueColor == 0)
- {
- btnCurColor.BackgroundColor = 0x00000000;
- }
controlView.AddChidren(btnCurColor);
btnCollection = new Button()
--
Gitblit v1.8.0