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

Revert "Windows: Check for bitmask instead for equality for initial window flags"

Browse Source 
This reverts commit 369be485101c856c626a85f77ea087603dcf8b6c.

Reason for revert: This breaks the customize window hints on Windows.

Fixes: QTBUG-133940
Change-Id: Ib553c3f3742a14e0487cda27d057a4f4d50f76e2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Wladimir Leuschner 2025-02-26 17:32:43 +00:00
parent 9b35b477f7
commit 6dcae3c144
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -654,13 +654,18 @@ static inline void fixTopLevelWindowFlags(Qt::WindowFlags &flags)
{ {
// Not supported on Windows, also do correction when it is set. // Not supported on Windows, also do correction when it is set.
flags &= ~Qt::WindowFullscreenButtonHint; flags &= ~Qt::WindowFullscreenButtonHint;
if (flags.testFlags((Qt::Dialog | Qt::Tool) & ~Qt::Window)) { switch (flags) {
flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; case Qt::Window:
} else if (flags.testFlag(Qt::Window)) {
flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinimizeButtonHint flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinimizeButtonHint
|Qt::WindowMaximizeButtonHint|Qt::WindowCloseButtonHint; |Qt::WindowMaximizeButtonHint|Qt::WindowCloseButtonHint;
break;
case Qt::Dialog:
case Qt::Tool:
flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
break;
default:
break;
} }
if ((flags & Qt::WindowType_Mask) == Qt::SplashScreen) if ((flags & Qt::WindowType_Mask) == Qt::SplashScreen)
flags |= Qt::FramelessWindowHint; flags |= Qt::FramelessWindowHint;
} }