From e0cea373fd5cda37421407a41453286469ac1145 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:16:11 +0800
Subject: [PATCH] Merge branch 'WJC' into MergeFL
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index 535912c..3cc7993 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -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);
@@ -54,7 +54,7 @@
Language.StringByID(StringId.Mode),
"");
patternView.Y = Application.GetRealHeight(263);
- patternView.X = Application.GetRealWidth(57);
+ patternView.X = Application.GetRealWidth(36);
patternView.Width = Application.GetRealWidth(96);
patternView.Height = Application.GetRealHeight(74);
FrameWhiteCentet1.AddChidren(patternView);
@@ -71,7 +71,7 @@
Language.StringByID(StringId.HeadSwinging),
"");
swingView.Y = Application.GetRealHeight(263);
- swingView.X = Application.GetRealWidth(216);
+ swingView.X = Application.GetRealWidth(229-34);
swingView.Width = Application.GetRealWidth(96);
swingView.Height = Application.GetRealHeight(74);
FrameWhiteCentet1.AddChidren(swingView);
@@ -89,7 +89,7 @@
Language.StringByID(StringId.Timing),
"");
timingView.Y = Application.GetRealHeight(366);
- timingView.X = Application.GetRealWidth(57);
+ timingView.X = Application.GetRealWidth(36);
timingView.Width = Application.GetRealWidth(96);
timingView.Height = Application.GetRealHeight(74);
FrameWhiteCentet1.AddChidren(timingView);
@@ -106,8 +106,8 @@
"FunctionIcon/IrFan/SpeedIconOn.png",
Language.StringByID(StringId.AirVolume),
"");
- airVolumeView.Y = Application.GetRealHeight(263);
- airVolumeView.X = Application.GetRealWidth(216);
+ airVolumeView.Y = Application.GetRealHeight(366);
+ airVolumeView.X = Application.GetRealWidth(229 - 34);
airVolumeView.Width = Application.GetRealWidth(96);
airVolumeView.Height = Application.GetRealHeight(74);
FrameWhiteCentet1.AddChidren(airVolumeView);
@@ -184,9 +184,9 @@
btnTitle = new Button()
{
- Gravity = Gravity.Center,
+ Y = btnIcon.Bottom,
Text = title,
- Height = Application.GetRealHeight(42),
+ Height = Application.GetRealHeight(30),
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -208,9 +208,11 @@
btnIcon.MouseUpEventHandler = eventHandler;
btnTitle.MouseUpEventHandler = eventHandler;
btnIcon.MouseDownEventHandler = (sender, e) => {
+ btnTitle.IsSelected = true;
btnIcon.IsSelected = true;
};
btnTitle.MouseDownEventHandler = (sender, e) => {
+ btnTitle.IsSelected = true;
btnIcon.IsSelected = true;
};
btnIcon.MouseUpEventHandler += (sender, e) => {
@@ -218,7 +220,8 @@
System.Threading.Thread.Sleep(500);
Application.RunOnMainThread(() =>
{
- btnIcon.IsSelected = true;
+ btnTitle.IsSelected = false;
+ btnIcon.IsSelected = false;
});
})
{ IsBackground = true }.Start();
@@ -228,7 +231,8 @@
System.Threading.Thread.Sleep(500);
Application.RunOnMainThread(() =>
{
- btnIcon.IsSelected = true;
+ btnTitle.IsSelected = false;
+ btnIcon.IsSelected = false;
});
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0