From c987cb1ef757a73e4f578e8f119e1b6ee2fcb656 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Sat, 27 Jan 2024 13:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`TextLimit`=E5=9C=A8=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF`TextMeshPro`=E5=90=8E=E6=97=A0=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#301)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Documentation~/zh/changelog.md       | 1 +
 Runtime/Internal/Object/ChartText.cs | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation~/zh/changelog.md b/Documentation~/zh/changelog.md
index 48726394..418b82c2 100644
--- a/Documentation~/zh/changelog.md
+++ b/Documentation~/zh/changelog.md
@@ -70,6 +70,7 @@ slug: /changelog
 
 ## master
 
+* (2024.01.27) 修复`TextLimit`在开启`TextMeshPro`后无效的问题 (#301)
 * (2024.01.24) 增加`Bar`支持X轴和Y轴都为`Category`类目轴
 * (2024.01.23) 增加`{y}`通配符用于获取Y轴的类目名
 * (2024.01.23) 增加`Line`支持X轴和Y轴都为`Category`类目轴
diff --git a/Runtime/Internal/Object/ChartText.cs b/Runtime/Internal/Object/ChartText.cs
index cc32d38f..31d68d66 100644
--- a/Runtime/Internal/Object/ChartText.cs
+++ b/Runtime/Internal/Object/ChartText.cs
@@ -263,9 +263,12 @@ public void SetFontAndSizeAndStyle(TextStyle textStyle, ComponentTheme theme)
         public float GetPreferredWidth(string content)
         {
 #if dUI_TextMeshPro
-            if (m_TMPText != null) return 0; // TODO:
+            if (m_TMPText != null && !string.IsNullOrEmpty(content))
+            {
+                return m_TMPText.GetPreferredValues(content).x;
+            }
 #else
-            if (m_Text != null)
+            if (m_Text != null && !string.IsNullOrEmpty(content))
             {
                 var tg = m_Text.cachedTextGeneratorForLayout;
                 var setting = m_Text.GetGenerationSettings(Vector2.zero);