diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:22:39 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-09-12 11:22:39 +1000 |
| commit | d744f3aedb7b09625f45ef659ed4c787bf45c42f (patch) | |
| tree | 00da8be0e8c426d00c3195d22fd998792187afba /src | |
| parent | 2fffff0d5d691f314829b0b3c8ecd59707afdb38 (diff) | |
| download | scintilla-mirror-d744f3aedb7b09625f45ef659ed4c787bf45c42f.tar.gz | |
Allow choice between windowed and inline IME.
Diffstat (limited to 'src')
| -rw-r--r-- | src/EditModel.cxx | 1 | ||||
| -rw-r--r-- | src/EditModel.h | 2 | ||||
| -rw-r--r-- | src/Editor.cxx | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/EditModel.cxx b/src/EditModel.cxx index 815d22781..8f66da463 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -61,6 +61,7 @@ EditModel::EditModel() { bracesMatchStyle = STYLE_BRACEBAD; highlightGuideColumn = 0; primarySelection = true; + imeInteraction = imeWindowed; foldFlags = 0; hotspot = Range(invalidPosition); wrapWidth = LineLayout::wrapWidthInfinite; diff --git a/src/EditModel.h b/src/EditModel.h index f7ca7497a..d8def3294 100644 --- a/src/EditModel.h +++ b/src/EditModel.h @@ -42,6 +42,8 @@ public: Selection sel; bool primarySelection; + enum IMEInteraction { imeWindowed, imeInline } imeInteraction; + int foldFlags; ContractionState cs; // Hotspot support diff --git a/src/Editor.cxx b/src/Editor.cxx index 8f0f43b08..af9d92cdc 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -6251,6 +6251,13 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_GETCODEPAGE: return pdoc->dbcsCodePage; + case SCI_SETIMEINTERACTION: + imeInteraction = static_cast<EditModel::IMEInteraction>(wParam); + break; + + case SCI_GETIMEINTERACTION: + return imeInteraction; + #ifdef INCLUDE_DEPRECATED_FEATURES case SCI_SETUSEPALETTE: InvalidateStyleRedraw(); |