水平スクロール時に文字が欠ける問題を修正

sakura-editor · Jan 3, 2025 · 1d3a15e · 1d3a15e
1 parent 53ea30b
commit 1d3a15e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/sakura_core/view/CTextDrawer.cpp b/sakura_core/view/CTextDrawer.cpp
@@ -94,10 +94,14 @@ void CTextDrawer::DispText( HDC hdc, DispPos* pDispPos, int marginy, const wchar
 		int nBeforeLogic = 0;
 		CLayoutInt nBeforeLayout = CLayoutInt(0);
 		if ( x < 0 ){
-			int nLeftLayout = ( 0 - x ) / nDx - 1;
-			CLayoutMgr& layoutMgr = m_pEditView->m_pcEditDoc->m_cLayoutMgr;
-			while (nBeforeLayout < nLeftLayout){
-				nBeforeLayout += layoutMgr.GetLayoutXOfChar(pData, nLength, nBeforeLogic);
+			const CLayoutMgr& layoutMgr = m_pEditView->m_pcEditDoc->m_cLayoutMgr;
+			const int nLeftLayout = (0 - x) / nDx;
+			while (nBeforeLogic < nLength) {
+				const CLayoutXInt nCharLayout = layoutMgr.GetLayoutXOfChar(pData, nLength, nBeforeLogic);
+				if (nLeftLayout < (nBeforeLayout + nCharLayout)) {
+					break;
+				}
+				nBeforeLayout += nCharLayout;
 				nBeforeLogic  += CNativeW::GetSizeOfChar( pData, nLength, nBeforeLogic );
 			}
 		}