From 8cd7b0fd1c53fc35a9817de31ab5d90f7dc7814b Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 16:59:43 +0800
Subject: [PATCH] 上传一个版本
---
HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
old mode 100755
new mode 100644
index 86e2b4e..6e906ef
--- a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -53,19 +53,6 @@
return;
}
- /// <summary>
- /// 娣诲姞鎸囧畾鐢婚潰锛屽苟绉婚櫎褰撳墠鐢婚潰锛屽惎鍔ㄥ弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾
- /// </summary>
- /// <param name="form">鐩爣鐣岄潰</param>
- /// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
- public void AddFormAndCloseNowForm(CommonFormBase form, params object[] parameter)
- {
- //绉婚櫎褰撳墠鐢婚潰
- this.CloseForm();
- //娣诲姞鐢婚潰
- form.AddForm(parameter);
- }
-
#endregion
#region 鈻� 鍏抽棴鐣岄潰___________________________
@@ -228,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