From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index 5a653c0..11604ef 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -31,7 +31,7 @@
//鍒濆鍖栫涓�涓储寮曢〉鐨勫唴瀹�
this.InitFrameWhiteContent1();
- ;
+
}
/// <summary>
@@ -44,7 +44,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(88),
Width = Application.GetRealWidth(134),
- Height = Application.GetRealHeight(134),
+ Height = Application.GetRealWidth(134),
UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png",
};
FrameWhiteCentet1.AddChidren(btnIcon);
@@ -184,7 +184,7 @@
btnTitle = new Button()
{
- Y = btnIcon.Bottom,
+ Y = Application.GetRealWidth(28),
Text = title,
Height = Application.GetRealHeight(30),
TextColor = CSS_Color.TextualColor,
--
Gitblit v1.8.0