diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-10 14:01:20 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-10 15:50:37 (GMT) |
| commit | d0b1717877c22082e6bfb518c760fe9f293a52e2 (patch) | |
| tree | 91d2ccda3908ea4d602c9d2dda15b8eee33da673 /src/gui/kernel/qapplication_win.cpp | |
| parent | a0529d55f0c1fb44e4c759b1d25fe7a095cdfc54 (diff) | |
| download | Qt-d0b1717877c22082e6bfb518c760fe9f293a52e2.zip Qt-d0b1717877c22082e6bfb518c760fe9f293a52e2.tar.gz Qt-d0b1717877c22082e6bfb518c760fe9f293a52e2.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.
This fixes the issue for Windows mobile too.
Task-number: 260702
Reviewed-by: thartman
Conflicts:
src/gui/kernel/qguifunctions_wince.cpp
Diffstat (limited to 'src/gui/kernel/qapplication_win.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 99baada..2b1aaf5 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2028,8 +2028,12 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam // where it got it from; it would simply get a 0 value as the old focus widget. #ifdef Q_WS_WINCE { - if (widget->windowState() & Qt::WindowMinimized) - widget->dataPtr()->window_state &= ~Qt::WindowMinimized; + if (widget->windowState() & Qt::WindowMinimized) { + if (widget->windowState() & Qt::WindowMaximized) + widget->showMaximized(); + else + widget->show(); + } #else if (!(widget->windowState() & Qt::WindowMinimized)) { #endif |