From 22deb7abf87dc164084eb4a618ea1ec8091689c6 Mon Sep 17 00:00:00 2001
From: Gary James <unknown>
Date: Wed, 2 Aug 2023 08:36:42 +1000
Subject: Bug [#2395]. Allow parent window to handle context menu events by
 setting as ignored.

---
 doc/ScintillaHistory.html                  | 13 +++++++++++++
 qt/ScintillaEditBase/ScintillaEditBase.cpp |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index a319fc52f..51303feec 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -578,9 +578,22 @@
 	<td>Enrico Tröger</td>
       </tr><tr>
 	<td>Chengzhi Li</td>
+	<td>Gary James</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla537.zip">Release 5.3.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 July 2023.
+	</li>
+	<li>
+	For Qt, allow parent window to handle context menu events by setting as ignored.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2395/">Bug #2395</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla536.zip">Release 5.3.6</a>
     </h3>
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 2499932b4..8a1355e53 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -372,6 +372,9 @@ void ScintillaEditBase::contextMenuEvent(QContextMenuEvent *event)
 	}
 	if (sqt->ShouldDisplayPopup(pt)) {
 		sqt->ContextMenu(pos);
+		event->accept();
+	} else {
+		event->ignore();
 	}
 }
 
-- 
cgit v1.2.3