summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-05-28 15:22:54 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-06-03 13:43:41 (GMT)
commitc890793e7a58e1d75d1f88f5e2c88162eddcca44 (patch)
tree8d3028e7b8b0651f360837d2602511f33c49242b
parentab873250fc93df5f5290fedbd5b17872cb1294c6 (diff)
downloadQt-c890793e7a58e1d75d1f88f5e2c88162eddcca44.zip
Qt-c890793e7a58e1d75d1f88f5e2c88162eddcca44.tar.gz
Qt-c890793e7a58e1d75d1f88f5e2c88162eddcca44.tar.bz2
force activation of minimized windows on Windows mobile
When pressing the <- key on a Windows mobile device, the window gets a minimized event (no other soft keys behave like that). Restoring the window via the app menu isn't possible, because the window get a WM_ACTIVATE but its internal state is still minimized. It makes sense to unminimize activated apps on Windows mobile. Task-number: 254673 Reviewed-by: thartman
-rw-r--r--src/gui/kernel/qapplication_win.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 670058b..7e97784 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2063,9 +2063,13 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
// WM_ACTIVATEAPP handles the "true" false case, as this is only when the application
// loses focus. Doing it here would result in the widget getting focus to not know
// where it got it from; it would simply get a 0 value as the old focus widget.
+#ifndef Q_WS_WINCE_WM
if (!(widget->windowState() & Qt::WindowMinimized)) {
// Ignore the activate message send by WindowsXP to a minimized window
-#ifdef Q_WS_WINCE_WM
+#else
+ {
+ if (widget->windowState() & Qt::WindowMinimized)
+ widget->dataPtr()->window_state &= ~Qt::WindowMinimized;
if (widget->windowState() & Qt::WindowFullScreen)
qt_wince_hide_taskbar(widget->winId());
#endif