From aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 三月 2021 09:19:10 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
index 814f7d7..6e906ef 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -215,6 +215,24 @@
return Application.GetRealWidth(i_size);
}
+ /// <summary>
+ /// 鑾峰彇鍥剧墖閲岄潰,瀛愭帶浠舵枃鏈殑楂樺害
+ /// </summary>
+ /// <param name="i_height">楂樺害</param>
+ /// <returns></returns>
+ public int GetPicChidrenTextHeight(int i_height)
+ {
+ int value1 = Application.GetRealHeight(i_height);
+ int value2 = Application.GetRealWidth(i_height);
+ //褰撳搴︽瘮鐜囧ぇ浜庨珮搴︽椂锛岀敤瀹藉害
+ if (value2 > value1)
+ {
+ return value2;
+ }
+ //鍚﹀垯,鑰冭檻鍒版樉绀哄畬鍏ㄧ殑闂,闇�瑕佷娇鐢ㄩ珮搴︽瘮鐜�
+ return value1;
+ }
+
#endregion
#region 鈻� 鍙嶅皠鏂规硶___________________________
--
Gitblit v1.8.0