From 2e652e0d9eaa867dfce6d442b80e8bc7f074a2f1 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Tue, 4 Oct 2022 12:48:46 +1100
Subject: Bug [#2349]. Fix bug where there were too many or too few lines when
 wrapping.

---
 doc/ScintillaHistory.html | 4 ++++
 gtk/ScintillaGTK.cxx      | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index cac690226..be351123b 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -623,6 +623,10 @@
 	<li>
 	On Win32 ensure page and step clicks on horizontal scroll bar do not overshoot document width.
 	</li>
+	<li>
+	On GTK, fix bug where there were too many or too few lines when wrapping.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2349/">Bug #2349</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla530.zip">Release 5.3.0</a>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index a256c484b..ec6f83058 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1786,6 +1786,12 @@ void ScintillaGTK::Resize(int width, int height) {
 	}
 	if (IS_WIDGET_MAPPED(PWidget(wMain))) {
 		ChangeSize();
+	} else {
+		const PRectangle rcTextArea = GetTextRectangle();
+		if (wrapWidth != rcTextArea.Width()) {
+			wrapWidth = rcTextArea.Width();
+			NeedWrapping();
+		}
 	}
 
 	alloc.x = 0;
-- 
cgit v1.2.3