summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_win.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-03 13:14:57 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-03 13:18:15 (GMT)
commit2669c6114062156b9fb77141afd0431c628d8599 (patch)
treed9866771713e2fac9b0db0e60cc570783f91bb16 /src/gui/kernel/qapplication_win.cpp
parent058520de736230b6867210c3f7c12d976c15adde (diff)
downloadQt-2669c6114062156b9fb77141afd0431c628d8599.zip
Qt-2669c6114062156b9fb77141afd0431c628d8599.tar.gz
Qt-2669c6114062156b9fb77141afd0431c628d8599.tar.bz2
restoring a minimized window on Windows CE didn't work
After restoring a minimized window we only saw the window decoration. All content was missing. That's because we don't get a WM_SIZE message for restoring the window. We must react on WM_ACTIVATE in this case. Task-number: 260702 Reviewed-by: thartman
Diffstat (limited to 'src/gui/kernel/qapplication_win.cpp')
-rw-r--r--src/gui/kernel/qapplication_win.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index ddc491b..b631dd5 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2082,7 +2082,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.
+#ifdef Q_OS_WINCE
+ {
+ if (widget->windowState() & Qt::WindowMinimized)
+ widget->dataPtr()->window_state &= ~Qt::WindowMinimized;
+#else
if (!(widget->windowState() & Qt::WindowMinimized)) {
+#endif
// Ignore the activate message send by WindowsXP to a minimized window
#ifdef Q_OS_WINCE_WM
if (widget->windowState() & Qt::WindowFullScreen)