AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Fix flag handling.

Browse Source 
Fix a typo that caused a variable to be hidden such that
the Qt::WindowFlags were not used.

Change-Id: Iea4456b0cd4c968e0fbfdd53e5006ffee0298b24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-03-08 16:13:28 +01:00 committed by Qt by Nokia
parent 4c0df9feb2
commit c35d65e27d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,17 +441,17 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange) const
{
if (desktop || !hwnd)
return;
UINT flags = SWP_NOMOVE | SWP_NOSIZE;
UINT swpFlags = SWP_NOMOVE | SWP_NOSIZE;
if (frameChange)
flags |= SWP_FRAMECHANGED;
swpFlags |= SWP_FRAMECHANGED;
if (topLevel) {
flags |= SWP_NOACTIVATE;
swpFlags |= SWP_NOACTIVATE;
if ((flags & Qt::WindowStaysOnTopHint) || (type == Qt::ToolTip)) {
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, flags);
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, swpFlags);
if (flags & Qt::WindowStaysOnBottomHint)
qWarning() << "QWidget: Incompatible window flags: the window can't be on top and on bottom at the same time";
} else if (flags & Qt::WindowStaysOnBottomHint) {
SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, flags);
SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, swpFlags);
}
if (flags & (Qt::CustomizeWindowHint|Qt::WindowTitleHint)) {
HMENU systemMenu = GetSystemMenu(hwnd, FALSE);
@ -461,7 +461,7 @@ void WindowCreationData::initialize(HWND hwnd, bool frameChange) const
EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_GRAYED);
}
} else { // child.
SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, flags);
SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, swpFlags);
}
}