From 336e893d28d6ba1dadf02133533d362b3d4dfdd4 Mon Sep 17 00:00:00 2001
From: John Ehresman <unknown>
Date: Fri, 10 Jun 2022 11:18:32 +1000
Subject: Bug [#2334] Fix hiding selection when selection layer is
 SC_LAYER_UNDER_TEXT.

---
 doc/ScintillaHistory.html | 12 ++++++++++++
 src/EditView.cxx          |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c6f3b3779..8cb63f362 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -573,6 +573,18 @@
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla524.zip">Release 5.2.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2022.
+	</li>
+	<li>
+	Fix hiding selection when selection layer is SC_LAYER_UNDER_TEXT.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2334/">Bug #2334</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla523.zip">Release 5.2.3</a>
     </h3>
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 9692593fb..6570d6df3 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -2355,7 +2355,9 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl
 	}
 
 	if (FlagSet(phase, DrawPhase::text)) {
-		DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::UnderText);
+		if (!hideSelection) {
+			DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::UnderText);
+		}
 		DrawTranslucentLineState(surface, model, vsDraw, ll, line, rcLine, subLine, Layer::UnderText);
 		DrawForeground(surface, model, vsDraw, ll, lineVisible, rcLine, lineRange, posLineStart, xStart,
 			subLine, background);
-- 
cgit v1.2.3