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/Controls/BaseControl/ButtonCtrBase.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs b/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs
index 60c8d0a..fe412fb 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/BaseControl/ButtonCtrBase.cs
@@ -360,13 +360,18 @@
/// <summary>
/// 鏍规嵁鏂囨湰,璁＄畻瀹冮渶瑕佺殑鎬昏鏁�
/// </summary>
+ /// <param name="i_width">褰撳�间负-1鏃�,闇�瑕佺埗鎺т欢,鐪熷疄鍊�</param>
/// <returns></returns>
- public int GetRealRowCountByText()
+ public int GetRealRowCountByText(int i_width = -1)
{
+ if (i_width == -1)
+ {
+ i_width = this.Width;
+ }
//鍏堣幏鍙栧畠鐨勭湡瀹炲搴�
int realWidth = this.GetRealWidthByText();
- int row = realWidth / this.Width;
- if (realWidth % this.Width > 0)
+ int row = realWidth / i_width;
+ if (realWidth % i_width > 0)
{
row++;
}
--
Gitblit v1.8.0