From cda69aa65110372aef5f4f9e06dada6b773cd9a8 Mon Sep 17 00:00:00 2001
From: John Ehresman <unknown>
Date: Sat, 14 Jan 2023 10:14:19 +1100
Subject: Bug [#2373]. Fix indicator drawing past left of text pane over
 margin.

---
 doc/ScintillaHistory.html       | 4 ++++
 qt/ScintillaEditBase/PlatQt.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 4de43355e..b585396c9 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -596,6 +596,10 @@
 	on Cocoa.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2374/">Bug #2374</a>.
 	</li>
+	<li>
+	On Qt, fix indicator drawing past left of text pane over margin.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2373/">Bug #2373</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla532.zip">Release 5.3.2</a>
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 42675933c..3a4889ca6 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -545,7 +545,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc,
 void SurfaceImpl::SetClip(PRectangle rc)
 {
 	GetPainter()->save();
-	GetPainter()->setClipRect(QRectFFromPRect(rc));
+	GetPainter()->setClipRect(QRectFFromPRect(rc), Qt::IntersectClip);
 }
 
 void SurfaceImpl::PopClip()
-- 
cgit v1.2.3