diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 13 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index a319fc52f..51303feec 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -578,10 +578,23 @@ <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> <ul> 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(); } } |