From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期四, 04 三月 2021 15:20:29 +0800 Subject: [PATCH] 2021-0304-1 --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs old mode 100755 new mode 100644 index 2071bab..6a6d92b --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs @@ -125,7 +125,6 @@ BorderWidth = 1, BackgroundColor = (uint)(0xFF000000 + light.GetRGBcolor()) }; - controlView.AddChidren(btnCurColor); btnCollection = new Button() @@ -254,6 +253,8 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, + Visible = light.HadFadeTime, + Enable = light.HadFadeTime, }; controlView.AddChidren(btnGradualChangeMinValuesText); @@ -274,6 +275,8 @@ MaxValue = 10, Progress = light.fadeTime, SeekBarPadding = Application.GetRealWidth(20), + Visible = light.HadFadeTime, + Enable = light.HadFadeTime, }; controlView.AddChidren(barFadeTime); @@ -287,16 +290,18 @@ TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, + Visible = light.HadFadeTime, + Enable = light.HadFadeTime, }; controlView.AddChidren(btnGradualChangeMaxValuesText); #endregion btnRestoredPoint = new Button() { - X = Application.GetRealWidth(104), - Y = Application.GetRealHeight(462), - Width = Application.GetMinRealAverage(40), - Height = Application.GetMinRealAverage(40), + X = Application.GetRealWidth(116), + Y = Application.GetRealHeight(466), + Width = Application.GetMinRealAverage(32), + Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "Public/Restored_Shadow.png", SelectedImagePath = "Public/Restored_Shadow.png", }; @@ -304,10 +309,10 @@ btnSwitch = new Button() { - X = btnRestoredPoint.Right + Application.GetRealWidth(40), - Y = Application.GetRealHeight(462), - Width = Application.GetMinRealAverage(40), - Height = Application.GetMinRealAverage(40), + X = btnRestoredPoint.Right + Application.GetRealWidth(32), + Y = Application.GetRealHeight(466), + Width = Application.GetMinRealAverage(32), + Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "Public/PowerClose.png", SelectedImagePath = "Public/PowerOpen.png", IsSelected = light.trait_on_off.curValue.ToString() == "on" -- Gitblit v1.8.0