aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaEditBase.cpp
diff options
context:
space:
mode:
authorjohnsonj <devnull@localhost>2015-12-14 15:03:51 +1100
committerjohnsonj <devnull@localhost>2015-12-14 15:03:51 +1100
commita2dd3d187967cd838747329dc37382796b01ad4f (patch)
treeb2acc097393603e33667266bb1b730ef1aa32528 /qt/ScintillaEditBase/ScintillaEditBase.cpp
parenteeb150883f74d5908872d71087814e73f4dd640e (diff)
downloadscintilla-mirror-a2dd3d187967cd838747329dc37382796b01ad4f.tar.gz
Block IME when some selected text is protected.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaEditBase.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index ea516fe17..13401fedf 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -443,7 +443,7 @@ 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()) {
+ if (sqt->pdoc->IsReadOnly() || sqt->SelectionContainsProtected()) {
// Here, a canceling and/or completing composition function is needed.
return;
}