From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
old mode 100755
new mode 100644
index fb23965..5689c26
--- a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
@@ -77,20 +77,30 @@
};
contentView.AddChidren(mesView);
- Button btnMes = new Button()
+ TextButton btnMes = new TextButton()
{
- Gravity = Gravity.CenterHorizontal,
+ //Gravity = Gravity.CenterHorizontal,
Width = mesView.Width,
- Height = mesView.Height,
+ //Height = mesView.Height,
+ Height = Application.GetRealWidth(20),
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.TextFontSize,
- IsMoreLines = true,
Text = msgStr,
//BackgroundColor = CSS_Color.AuxiliaryColor2
};
mesView.AddChidren(btnMes);
+ //鍔ㄦ�佽绠楅珮搴�
+ var needHeight = btnMes.GetMoreLineNeedHeight();
+ if(needHeight < mesView.Height)
+ {
+ needHeight = mesView.Height;
+ }
+ btnMes.IsMoreLines = true;
+ btnMes.Height = needHeight;
+ //mesView.AddChidren(btnMes);
+
Button btnLine = new Button()
{
@@ -121,7 +131,7 @@
X = contentView.Width - Width144,
Y = btnLine.Y,
Width = Width144,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
@@ -151,7 +161,7 @@
{
Y = btnLine.Y,
Width = contentView.Width,
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
--
Gitblit v1.8.0