aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaQt.cpp
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-09-12 11:22:39 +1000
committerNeil <nyamatongwe@gmail.com>2014-09-12 11:22:39 +1000
commitd744f3aedb7b09625f45ef659ed4c787bf45c42f (patch)
tree00da8be0e8c426d00c3195d22fd998792187afba /qt/ScintillaEditBase/ScintillaQt.cpp
parent2fffff0d5d691f314829b0b3c8ecd59707afdb38 (diff)
downloadscintilla-mirror-d744f3aedb7b09625f45ef659ed4c787bf45c42f.tar.gz
Allow choice between windowed and inline IME.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index c2b250a3e..1c34a5b0b 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -38,6 +38,8 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent)
wMain = scrollArea->viewport();
+ imeInteraction = imeInline;
+
// On OS X drawing text into a pixmap moves it around 1 pixel to
// the right compared to drawing it directly onto a window.
// Buffered drawing turned off by default to avoid this.
@@ -651,6 +653,10 @@ sptr_t ScintillaQt::WndProc(unsigned int message, uptr_t wParam, sptr_t lParam)
try {
switch (message) {
+ case SCI_SETIMEINTERACTION:
+ // Only inline IME supported on Qt
+ break;
+
case SCI_GRABFOCUS:
scrollArea->setFocus(Qt::OtherFocusReason);
break;