From 81f3d22db1581d3ddffd9c4b434e3dd7d2a51cbe Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Mon, 5 May 2025 16:44:55 +1000
Subject: Bug [#2416]. Reset vertical scroll bar synchronously in
 SCI_SETDOCPOINTER to fix bug where scroll position not restored in non-wrap
 mode.

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

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 4da325dae..36b1f56f7 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -607,6 +607,11 @@
 	<li>
 	Tweak SC_MARK_BAR to be slightly wider by using next higher whole pixel instead of next lower for margin width / 3.
 	</li>
+	<li>
+	On GTK, reset vertical scroll bar synchronously in SCI_SETDOCPOINTER to fix bug where
+	scroll position not restored in non-wrap mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2416/">Bug #2416</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla556.zip">Release 5.5.6</a>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index d1cce0fbd..9c9e36c1a 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -3097,6 +3097,8 @@ void ScintillaGTK::SetDocPointer(Document *document) {
 
 	Editor::SetDocPointer(document);
 
+	ChangeScrollBars();
+
 	if (sciAccessible) {
 		// the accessible needs have the old Document, but also the new one active
 		sciAccessible->ChangeDocument(oldDoc, pdoc);
-- 
cgit v1.2.3