From 5641f6ad8f8d319562f2a3c10fbd251ad2e300ef Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Thu, 16 Dec 2021 12:49:10 +1100
Subject: Feature [feature-requests:#1422] Fix scrollbar with annotations and
 wrapping.

---
 doc/ScintillaHistory.html | 5 +++++
 src/Editor.cxx            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index a77acf033..d6de74ec1 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -582,6 +582,11 @@
 	<li>
 	Fix potential issue with length of buffer for string returning APIs in ScintillaEdit on Qt.
 	</li>
+	<li>
+	Fix inaccurate scroll bar when there are annotations and wrapping of inserted or deleted text changes
+	number of screen lines.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1422/">Feature #1422</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla515.zip">Release 5.1.5</a>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index a47c9ce0d..a4d60019f 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -5290,6 +5290,8 @@ void Editor::SetAnnotationHeights(Sci::Line start, Sci::Line end) {
 				changedHeight = true;
 		}
 		if (changedHeight) {
+			SetScrollBars();
+			SetVerticalScrollPos();
 			Redraw();
 		}
 	}
-- 
cgit v1.2.3