aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorjohnsonj <devnull@localhost>2015-12-10 19:32:52 +1100
committerjohnsonj <devnull@localhost>2015-12-10 19:32:52 +1100
commit6f015a5a9dcc8b0c3a950efac1e972391d519c0f (patch)
treec9be8bf073e636d5a9a21f254469741f8888cb89
parentbed632c133c35bb22676c99efd52a27da8b3cf48 (diff)
downloadscintilla-mirror-6f015a5a9dcc8b0c3a950efac1e972391d519c0f.tar.gz
Do nothing for IME composition for read-only documents.
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 6ca1ae1de..68cdc9e36 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -443,6 +443,11 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
// Copy & paste by johnsonj with a lot of helps of Neil
// Great thanks for my forerunners, jiniya and BLUEnLIVE
+ if (sqt->pdoc->IsReadOnly()) {
+ // Here, a canceling and/or completing composition function is needed.
+ return;
+ }
+
if (sqt->pdoc->TentativeActive()) {
sqt->pdoc->TentativeUndo();
} else {