From b55fe675d1dd17748a29e4e7de60d14e36740a6e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 14 十月 2023 13:01:30 +0800
Subject: [PATCH] 2023年10月14日13:01:27

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
index 8fda857..7a4446d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -131,7 +131,7 @@
                     buttonFram.Enable = false;
                     buttonFram.GetImageButton().Enable = false;
                     buttonFram.GetNameButton().Enable = false;
-                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
+                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                 }
                 buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                 {
@@ -219,7 +219,7 @@
                     buttonFram.Enable = false;
                     buttonFram.GetImageButton().Enable = false;
                     buttonFram.GetNameButton().Enable = false;
-                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
+                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                 }
                 buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                 {
@@ -252,7 +252,7 @@
             }
             int currnetheightValue = 0;
             int currnetWidthValue = 0;
-            int heightMaxValue = 84;
+            int heightMaxValue = 84-6;
             int widthMaxValue = 78;
             //鑾峰彇鐩稿涓�涓含搴﹀��
             int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
@@ -289,19 +289,27 @@
                 if (!keypad.isClicked)
                 {
                     button.Enable = false;
-                    button.BackgroundColor = AksCommonMethod.unBackgroundColor;
+                    button.TextColor = AksCommonMethod.unBackgroundColor;
                 }
                 button.MouseDownEventHandler += (sen, e) =>
+                {
+                    
+                    button.IsSelected = true;
+
+                };
+                button.MouseUpOutsideEventHandler += (sen, e) =>
+                {
+
+                    button.IsSelected = true;
+
+                };
+                button.MouseUpEventHandler += (sen, e) =>
                 {
                     if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")
                     {
                         return;
                     }
-                    button.IsSelected = true;
                     selectKeyAction?.Invoke((KeypadEntity)button.Tag);
-                };
-                button.MouseUpEventHandler += (sen, e) =>
-                {
                     button.IsSelected = false;
                 };
 

--
Gitblit v1.8.0