From 2835fe50d3e194c21b16fec1c53ff905dd3a3ceb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 七月 2021 13:12:36 +0800
Subject: [PATCH] 20210630

---
 HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
index 535912c..5a653c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -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