From 32ec981745e6abc9532a443f2e88c465a2fdb480 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 11 Oct 2011 16:33:42 +0200 Subject: Windows: Adapt to new Lighthouse API - Implement debug/deprecated options of QSurfaceFormat - Implement stylehints - Fixed input context to position the input window correctly. Change-Id: Icba22f183c6895e30bd34d60cf6d2307ed3188cd Reviewed-on: http://codereview.qt-project.org/6446 Sanity-Review: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsinputcontext.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsinputcontext.h') diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h index 2c683ee4e7..17cae5b158 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.h +++ b/src/plugins/platforms/windows/qwindowsinputcontext.h @@ -52,6 +52,8 @@ class QInputMethodEvent; class QWindowsInputContext : public QPlatformInputContext { + Q_OBJECT + struct CompositionContext { CompositionContext(); @@ -68,8 +70,7 @@ public: virtual void reset(); virtual void update(Qt::InputMethodQueries); - - virtual void mouseHandler(int x, QMouseEvent *event); + virtual void invokeAction(QInputPanel::Action, int cursorPosition); static QWindowsInputContext *instance(); @@ -81,6 +82,9 @@ public: bool handleIME_Request(WPARAM wparam, LPARAM lparam, LRESULT *result); +private slots: + void cursorRectChanged(); + private: void initContext(HWND hwnd); void doneContext(); -- cgit v1.2.3