From 149197611993b19d4abae1012c52d7fec4fcaa2d Mon Sep 17 00:00:00 2001
From: Michael Berlenz <unknown>
Date: Thu, 10 Mar 2022 11:25:15 +1100
Subject: Bug [#2320] Fix position of end-of-line annotation when fold display
 text is visible.

---
 src/EditView.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/EditView.cxx')

diff --git a/src/EditView.cxx b/src/EditView.cxx
index 961c54332..d4ab63948 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -1485,7 +1485,9 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c
 	const char *textFoldDisplay = model.GetFoldDisplayText(line);
 	if (textFoldDisplay) {
 		const std::string_view foldDisplayText(textFoldDisplay);
-		rcSegment.left += (static_cast<int>(surface->WidthText(fontText, foldDisplayText)) + vsDraw.aveCharWidth);
+		rcSegment.left += static_cast<int>(
+			surface->WidthText(vsDraw.styles[StyleFoldDisplayText].font.get(), foldDisplayText)) +
+			vsDraw.aveCharWidth;
 	}
 	rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthEOLAnnotationText);
 
-- 
cgit v1.2.3