From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期三, 03 三月 2021 16:03:03 +0800 Subject: [PATCH] 20210303-1 --- HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs index 57efe09..434c27e 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs @@ -196,21 +196,22 @@ btnCurtainClose = new Button() { - X = Application.GetRealWidth(64), - Y = Application.GetRealHeight(462), - Width = Application.GetMinRealAverage(40), - Height = Application.GetMinRealAverage(40), + X = Application.GetRealWidth(84), + Y = Application.GetRealHeight(466), + Width = Application.GetMinRealAverage(32), + Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png", + IsSelected = curtain.GetAttrState(FunctionAttributeKey.Percent) == "0", }; controlView.AddChidren(btnCurtainClose); btnCurtainStop = new Button() { - X = Application.GetRealWidth(144), - Y = Application.GetRealHeight(462), - Width = Application.GetMinRealAverage(40), - Height = Application.GetMinRealAverage(40), + X = Application.GetRealWidth(148), + Y = Application.GetRealHeight(466), + Width = Application.GetMinRealAverage(32), + Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png", }; @@ -218,12 +219,13 @@ btnCurtainOpen = new Button() { - X = Application.GetRealWidth(224), - Y = Application.GetRealHeight(462), - Width = Application.GetMinRealAverage(40), - Height = Application.GetMinRealAverage(40), + X = Application.GetRealWidth(212), + Y = Application.GetRealHeight(466), + Width = Application.GetMinRealAverage(32), + Height = Application.GetMinRealAverage(32), UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png", SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png", + IsSelected = curtain.GetAttrState(FunctionAttributeKey.Percent) != "0", }; controlView.AddChidren(btnCurtainOpen); -- Gitblit v1.8.0