diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-16 12:24:32 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 05:26:08 +0100 |
| commit | 4212898822f1798dac0167e4f6a147bd8a3b3dcc (patch) | |
| tree | 34552fa359ba06fa125c7d106be4194fef9f6b9e /src/plugins/platforms/windows/qtwindowsglobal.h | |
| parent | 543d994967628f580eb34d4d0241846eaef3bd7d (diff) | |
Base active window handling on WM_SET/KILLFOCUS.
Make it work for child windows, fixing the isActive()
test of QWindow.
Task-number: QTBUG-24185
Change-Id: I75597c2d322969f7e109d76e30b9b1f4b66c6e1e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qtwindowsglobal.h')
| -rw-r--r-- | src/plugins/platforms/windows/qtwindowsglobal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h index f044362299..3445a3c7a8 100644 --- a/src/plugins/platforms/windows/qtwindowsglobal.h +++ b/src/plugins/platforms/windows/qtwindowsglobal.h @@ -77,6 +77,8 @@ enum WindowsEventType // Simplify event types ResizeEvent = WindowEventFlag + 12, QuerySizeHints = WindowEventFlag + 15, CalculateSize = WindowEventFlag + 16, + FocusInEvent = WindowEventFlag + 17, + FocusOutEvent = WindowEventFlag + 18, MouseEvent = MouseEventFlag + 1, MouseWheelEvent = MouseEventFlag + 2, TouchEvent = TouchEventFlag + 1, @@ -170,6 +172,10 @@ inline QtWindows::WindowsEventType windowsEventType(UINT message, WPARAM wParamI } case WM_GETOBJECT: return QtWindows::AccessibleObjectFromWindowRequest; + case WM_SETFOCUS: + return QtWindows::FocusInEvent; + case WM_KILLFOCUS: + return QtWindows::FocusOutEvent; case WM_DISPLAYCHANGE: return QtWindows::DisplayChangedEvent; default: |