From d744f3aedb7b09625f45ef659ed4c787bf45c42f Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 12 Sep 2014 11:22:39 +1000 Subject: Allow choice between windowed and inline IME. --- qt/ScintillaEditBase/ScintillaQt.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp') 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; -- cgit v1.2.3