amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-24 19:50:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed https://bugreports.qt.io/browse/QTBUG-98354

Browse Source
This commit is contained in:
kleuter 2024-10-10 16:17:40 +02:00
parent a920ade12c
commit b0937302d5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
6.8.0/qtbase/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
View File

@ -52,6 +52,14 @@ static const int windowsRightBorder = 15; // right border on windows
# define CMDLGS_DISABLED 4 # define CMDLGS_DISABLED 4
#endif #endif
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 };
}
// QWindowsVistaStylePrivate ------------------------------------------------------------------------- // QWindowsVistaStylePrivate -------------------------------------------------------------------------
// Static initializations // Static initializations
QVarLengthFlatMap<const QScreen *, HWND, 4> QWindowsVistaStylePrivate::m_vistaTreeViewHelpers; QVarLengthFlatMap<const QScreen *, HWND, 4> QWindowsVistaStylePrivate::m_vistaTreeViewHelpers;
@ -2911,6 +2919,10 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
theme.stateId = bullet ? MC_BULLETNORMAL: MC_CHECKMARKNORMAL; theme.stateId = bullet ? MC_BULLETNORMAL: MC_CHECKMARKNORMAL;
d->drawBackground(theme); d->drawBackground(theme);
} }
else if (QOperatingSystemVersion::current() >= QOSWorkaround::Windows11
&& !act) {
painter->fillRect(checkRect, menuitem->palette.highlight().color().lighter(200));
}
} }
if (!menuitem->icon.isNull()) { if (!menuitem->icon.isNull()) {