From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index ef18b6e..11e01c8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
@@ -140,14 +140,11 @@
                 gfSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                 gfSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                 gfSingleFramLayout.btnLeftImage.Visible = false;
-
-                if (gfSingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
-                {
-                    gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + gfSingleFramLayout.btnName.GetTextWidth();
-                    gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - gfSingleFramLayout.btnName.GetTextWidth();
-                    gfSingleFramLayout.btnName.Width = gfSingleFramLayout.btnName.GetTextWidth();
-                    gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                }
+                gfSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+                gfSingleFramLayout.singleFramLayout,
+                gfSingleFramLayout.btnName,
+                gfSingleFramLayout.btnRightImage,
+                48, 200);
             }
             else
             {
@@ -155,7 +152,7 @@
                 typeMultiFramLayout = new TypeMultiFramLayout();
                 typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
                 typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
 
             }
             this.AdjustRealHeight(16);

--
Gitblit v1.8.0