From adf46e4da2f53d171cc5a0e95340d751ebacf763 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 14:25:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/LogEdit.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/LogEdit.h b/SourceCode/Bond/Servo/LogEdit.h
index cdccb5c..3a3e823 100644
--- a/SourceCode/Bond/Servo/LogEdit.h
+++ b/SourceCode/Bond/Servo/LogEdit.h
@@ -10,12 +10,15 @@
 public:
 	void SetMaxLineCount(int line);
 	void AppendText(const char* pszText);
-
+	BOOL IsScrollBarAtBottom();
 
 private:
-	int m_nMaxLineCount;
+	int m_nMaxLines;
+	int m_nTrimLines;
+	BOOL m_bAutoScroll;		// 是否自动滚动
 
 	DECLARE_MESSAGE_MAP()
 	afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
+	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 };
 

--
Gitblit v1.9.3