diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib
index 24b2718..2382a3b 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.lib differ
diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb
index 155669f..1563542 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_Win32.pdb differ
diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib
index ff428e5..da54907 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.lib differ
diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb
index bdd0061..71cf713 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Debug_x64.pdb differ
diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib
index 90d1a7a..0af0cd6 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_Win32.lib differ
diff --git a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib
index a20be2e..8d77057 100644
Binary files a/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib and b/demo/Adminstor/ThirdParty/EzUI/lib/EzUI_Release_x64.lib differ
diff --git a/lib/EzUI_Debug_Win32.lib b/lib/EzUI_Debug_Win32.lib
index 24b2718..2382a3b 100644
Binary files a/lib/EzUI_Debug_Win32.lib and b/lib/EzUI_Debug_Win32.lib differ
diff --git a/lib/EzUI_Debug_Win32.pdb b/lib/EzUI_Debug_Win32.pdb
index 155669f..1563542 100644
Binary files a/lib/EzUI_Debug_Win32.pdb and b/lib/EzUI_Debug_Win32.pdb differ
diff --git a/lib/EzUI_Debug_x64.lib b/lib/EzUI_Debug_x64.lib
index ff428e5..da54907 100644
Binary files a/lib/EzUI_Debug_x64.lib and b/lib/EzUI_Debug_x64.lib differ
diff --git a/lib/EzUI_Debug_x64.pdb b/lib/EzUI_Debug_x64.pdb
index bdd0061..71cf713 100644
Binary files a/lib/EzUI_Debug_x64.pdb and b/lib/EzUI_Debug_x64.pdb differ
diff --git a/lib/EzUI_Release_Win32.lib b/lib/EzUI_Release_Win32.lib
index 90d1a7a..0af0cd6 100644
Binary files a/lib/EzUI_Release_Win32.lib and b/lib/EzUI_Release_Win32.lib differ
diff --git a/lib/EzUI_Release_x64.lib b/lib/EzUI_Release_x64.lib
index a20be2e..8d77057 100644
Binary files a/lib/EzUI_Release_x64.lib and b/lib/EzUI_Release_x64.lib differ
diff --git a/sources/TextBox.cpp b/sources/TextBox.cpp
index d708d40..d6d17af 100644
--- a/sources/TextBox.cpp
+++ b/sources/TextBox.cpp
@@ -1,4 +1,4 @@
-#include "TextBox.h"
+#include "TextBox.h"
 #undef min
 #undef max
 namespace ezui {
@@ -374,7 +374,7 @@ namespace ezui {
 		int innerW = std::max(0, Width() - (m_padLeft + m_padRight));
 		int innerH = std::max(0, Height() - (m_padTop + m_padBottom));
 
-		if (!m_autoWrap && !m_allowManualLineBreak) {//单行编辑框（两者都不允许）
+		if (!m_autoWrap) {//不自动换行时需要水平拖动滚动编辑框（两者都不允许）
 			m_font->Get()->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP);
 			bool bAlignLeft = (int(this->TextAlign) & int(HAlign::Left));
 			float width = bAlignLeft ? EZUI_FLOAT_MAX : (float)innerW;
@@ -436,19 +436,22 @@ namespace ezui {
 		m_careRect.Height = m_textLayout->GetFontHeight();
 		m_careRect.Width = 1 * this->GetScale();
 
-		if (!m_autoWrap && !m_allowManualLineBreak) {
-			// 使光标保持在可视内区（考虑 padding）
-			int innerW = std::max(0, Width() - (m_padLeft + m_padRight));
-			int caretDrawX = m_careRect.X + m_scrollX; // 布局坐标 + 滚动
-			if (caretDrawX < 0) { // 左越界
-				m_scrollX -= caretDrawX;
-			}
-			if (caretDrawX > innerW) { // 右越界
-				int offsetX = innerW - caretDrawX;
-				m_scrollX += offsetX;
-			}
+// 处理水平滚动（当不自动换行时需要水平滚动）
+	if (!m_autoWrap) {
+		// 使光标保持在可视内区（考虑 padding）
+		int innerW = std::max(0, Width() - (m_padLeft + m_padRight));
+		int caretDrawX = m_careRect.X + m_scrollX; // 布局坐标 + 滚动
+		if (caretDrawX < 0) { // 左越界
+			m_scrollX -= caretDrawX;
 		}
-		else { // 多行：处理垂直滚动保持光标可见
+		if (caretDrawX > innerW) { // 右越界
+			int offsetX = innerW - caretDrawX;
+			m_scrollX += offsetX;
+		}
+	}
+	
+	// 处理垂直滚动（多行模式需要垂直滚动）
+	if (m_autoWrap || m_allowManualLineBreak) {
 			int innerH = std::max(0, Height() - (m_padTop + m_padBottom));
 			int caretDrawY = m_careRect.Y + m_scrollY; // 仅布局+滚动
 			if (caretDrawY < 0) {
@@ -492,7 +495,7 @@ namespace ezui {
 	void TextBox::OnMouseWheel(const MouseEventArgs& arg)
 	{
 		__super::OnMouseWheel(arg);
-		if (!m_autoWrap && !m_allowManualLineBreak) {//单行
+		if (!m_autoWrap) {//不自动换行时需要水平拖动滚动
 			int innerW = std::max(0, Width() - (m_padLeft + m_padRight));
 			int textWidth = m_fontBox.Width;
 			if (arg.ZDelta > 0 && textWidth > innerW) {
@@ -560,7 +563,7 @@ namespace ezui {
 
 				BuildSelectedRect();
 
-			if (!m_autoWrap && !m_allowManualLineBreak) {//单行
+			if (!m_autoWrap) {//不自动换行时需要水平拖动滚动
 					// 计算去掉左 padding 的鼠标相对文本区域坐标
 					int innerW = std::max(0, Width() - (m_padLeft + m_padRight));
 					int textWidth = m_fontBox.Width;