From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
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