From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
index e92f3e5..efa0d57 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -285,7 +285,7 @@
var btnGradualChangeMinValuesText = new Button()
{
X = Application.GetRealWidth(35),
- Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(22),
Height = Application.GetRealHeight(21),
Text = "0s",
@@ -323,7 +323,7 @@
var btnGradualChangeMaxValuesText = new Button()
{
X = barFadeTime.Right,
- Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
Text = "10s",
@@ -360,7 +360,7 @@
var btnEditColorful = new Button()
{
X = Application.GetRealWidth(35),
- Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(22),
Height = Application.GetRealHeight(21),
UnSelectedImagePath = "Public/Edit.png",
@@ -376,7 +376,7 @@
var barColorful = new FrameLayout()
{
X = btnEditColorful.Right + Application.GetRealWidth(15),
- Y = Application.GetRealHeight(27 + heightMore + magriHeight),
+ Y = Application.GetRealHeight(37 + heightMore + magriHeight),
Width = Application.GetRealWidth(180),
Height = Application.GetRealHeight(8),
BackgroundImagePath = "FunctionIcon/Light/ColorfulBar.png",
@@ -386,7 +386,7 @@
btnColorfulSwitch = new Button()
{
X = barColorful.Right + Application.GetRealWidth(8),
- Y = btnGradualChangeText.Bottom,// + Application.GetRealHeight(10),
+ Y = btnGradualChangeText.Bottom + Application.GetRealHeight(10),
Width = Application.GetRealWidth(38),
Height = Application.GetRealHeight(24),
UnSelectedImagePath = "Public/Switch.png",
--
Gitblit v1.8.0