1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up touch window registration.

Browse Source 
Stop processing for Qt::Desktop windows (which caused
RegisterTouchWindow() to fail with access denied) and set a
flag to cleanly unregister.

Change-Id: I3d10c93ec92536d3ab1c0503f088c40b0c08a01f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Friedemann Kleint 2013-03-22 16:23:36 +01:00 committed by The Qt Project
parent a6e5ccbe22
commit 23051ff7ec
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -791,13 +791,16 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const WindowData &data) :
m_iconSmall(0), m_iconSmall(0),
m_iconBig(0) m_iconBig(0)
{ {
if (aWindow->surfaceType() == QWindow::OpenGLSurface)
setFlag(OpenGLSurface);
// Clear the creation context as the window can be found in QWindowsContext's map. // Clear the creation context as the window can be found in QWindowsContext's map.
QWindowsContext::instance()->setWindowCreationContext(QSharedPointer<QWindowCreationContext>()); QWindowsContext::instance()->setWindowCreationContext(QSharedPointer<QWindowCreationContext>());
QWindowsContext::instance()->addWindow(m_data.hwnd, this); QWindowsContext::instance()->addWindow(m_data.hwnd, this);
const Qt::WindowType type = aWindow->type();
if (type == Qt::Desktop)
return; // No further handling for Qt::Desktop
if (aWindow->surfaceType() == QWindow::OpenGLSurface)
setFlag(OpenGLSurface);
if (aWindow->isTopLevel()) { if (aWindow->isTopLevel()) {
switch (aWindow->type()) { switch (type) {
case Qt::Window: case Qt::Window:
case Qt::Dialog: case Qt::Dialog:
case Qt::Sheet: case Qt::Sheet:
@ -811,8 +814,13 @@ QWindowsWindow::QWindowsWindow(QWindow *aWindow, const WindowData &data) :
} }
} }
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
if (QWindowsContext::instance()->systemInfo() & QWindowsContext::SI_SupportsTouch) if (QWindowsContext::instance()->systemInfo() & QWindowsContext::SI_SupportsTouch) {
QWindowsContext::user32dll.registerTouchWindow(m_data.hwnd, 0); if (QWindowsContext::user32dll.registerTouchWindow(m_data.hwnd, 0)) {
setFlag(TouchRegistered);
} else {
qErrnoWarning("RegisterTouchWindow() failed for window '%s'.", qPrintable(aWindow->objectName()));
}
}
#endif // !Q_OS_WINCE #endif // !Q_OS_WINCE
setWindowState(aWindow->windowState()); setWindowState(aWindow->windowState());
const qreal opacity = qt_window_private(aWindow)->opacity; const qreal opacity = qt_window_private(aWindow)->opacity;
@ -824,7 +832,7 @@ QWindowsWindow::~QWindowsWindow()
{ {
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
QWindowSystemInterface::flushWindowSystemEvents(); QWindowSystemInterface::flushWindowSystemEvents();
if (QWindowsContext::instance()->systemInfo() & QWindowsContext::SI_SupportsTouch) if (testFlag(TouchRegistered))
QWindowsContext::user32dll.unregisterTouchWindow(m_data.hwnd); QWindowsContext::user32dll.unregisterTouchWindow(m_data.hwnd);
#endif // !Q_OS_WINCE #endif // !Q_OS_WINCE
destroyWindow(); destroyWindow();

3
src/plugins/platforms/windows/qwindowswindow.h
View File

@ -131,7 +131,8 @@ public:
FrameStrutEventsEnabled = 0x200, FrameStrutEventsEnabled = 0x200,
SynchronousGeometryChangeEvent = 0x400, SynchronousGeometryChangeEvent = 0x400,
WithinSetStyle = 0x800, WithinSetStyle = 0x800,
WithinDestroy = 0x1000 WithinDestroy = 0x1000,
TouchRegistered = 0x2000
}; };
struct WindowData struct WindowData