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

Vista style: remove temporary workaround

Browse Source 
The MinGW issue has been fixed some time ago.

Change-Id: Ie2eaa2952d398a913b06d36d7e621efff9e4c926
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Yuhang Zhao 2022-12-15 13:50:54 +08:00
parent 5fe52a0420
commit 514a6cb7dc
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
View File

@ -68,14 +68,6 @@ HTHEME QWindowsVistaStylePrivate::m_themes[NThemes];
bool QWindowsVistaStylePrivate::useVistaTheme = false;
Q_CONSTINIT QBasicAtomicInt QWindowsVistaStylePrivate::ref = Q_BASIC_ATOMIC_INITIALIZER(-1); // -1 based refcounting
namespace QOSWorkaround {
// Due to a mingw bug being confused by static constexpr variables in an exported class,
// we cannot use QOperatingSystemVersion::Windows11 in libraries outside of QtCore.
// ### TODO Remove this when that problem is fixed.
static constexpr QOperatingSystemVersionBase Windows11 { QOperatingSystemVersionBase::Windows,
10, 0, 22000 };
}
static void qt_add_rect(HRGN &winRegion, QRect r)
{
HRGN rgn = CreateRectRgn(r.left(), r.top(), r.x() + r.width(), r.y() + r.height());
@ -2939,7 +2931,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
else
theme.stateId = bullet ? MC_BULLETNORMAL: MC_CHECKMARKNORMAL;
d->drawBackground(theme);
} else if (QOperatingSystemVersion::current() >= QOSWorkaround::Windows11
} else if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows11
&& !act) {
painter->fillRect(checkRect, menuitem->palette.highlight().color().lighter(200));
}
@ -3024,7 +3016,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
partId, stateId, option->rect);
d->drawBackground(theme);
}
return;
return;
case CE_MenuBarEmptyArea: {
stateId = MBI_NORMAL;