summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowswindow.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-11-12 09:13:23 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2014-11-26 21:14:48 +0100
commitb55f88caba339a49bf0ebabfa324dde523c2b866 (patch)
treee46f7384de455a36badf3df8bb68e6136c70006c /src/plugins/platforms/windows/qwindowswindow.h
parentc91c05b056c769c3df0d7634aed7d9bf2c0e550d (diff)
Windows: Correctly associate IME contexts.
Associate a 0-context with the window if IME is disabled, store this state as a flag to QWindowsWindow. Associate default context again when enabled window gains focus. Task-number: QTBUG-40691 Change-Id: I78d5494a05f93a39e245ca7c096d45445e684ea8 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.h')
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index 71debf2476..edba992b19 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -138,7 +138,8 @@ public:
Exposed = 0x10000,
WithinCreate = 0x20000,
WithinMaximize = 0x40000,
- MaximizeToFullScreen = 0x80000
+ MaximizeToFullScreen = 0x80000,
+ InputMethodDisabled =0x100000
};
QWindowsWindow(QWindow *window, const QWindowsWindowData &data);