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

QWindows11Style: Draw ScrollArea opaque in QAbstractItemView

Browse Source 
Change-Id: Ica2c62355a576dda4eaefacbc41b8609009d0073
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Wladimir Leuschner 2024-03-04 16:26:26 +01:00 committed by Jani Heikkinen
parent d11d503850
commit a1e3d310ed
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -1724,19 +1724,6 @@ QRect QWindows11Style::subControlRect(ComplexControl control, const QStyleOption
QRect ret; QRect ret;
switch (control) { switch (control) {
#if QT_CONFIG(combobox)
case QStyle::CC_ComboBox:
if (const QStyleOptionComboBox *combobox = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
switch (subControl) {
case SC_ComboBoxEditField:
ret = combobox->rect.adjusted(8,0,0,0);
break;
default:
ret = QWindowsVistaStyle::subControlRect(control, option, subControl, widget);
}
}
break;
#endif
#if QT_CONFIG(spinbox) #if QT_CONFIG(spinbox)
case CC_SpinBox: case CC_SpinBox:
if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
@ -1969,9 +1956,11 @@ void QWindows11Style::polish(QWidget* widget)
widget->setPalette(pal); widget->setPalette(pal);
} }
else if (widget->inherits("QAbstractScrollArea") && !widget->inherits("QMdiArea")) { else if (widget->inherits("QAbstractScrollArea") && !widget->inherits("QMdiArea")) {
if (auto scrollarea = qobject_cast<QAbstractScrollArea*>(widget)) { if (const auto *scrollarea = qobject_cast<QAbstractScrollArea *>(widget)) {
QPalette pal = widget->palette(); QPalette pal = widget->palette();
pal.setColor(scrollarea->viewport()->backgroundRole(), Qt::transparent); QColor backgroundColor = widget->palette().base().color();
backgroundColor.setAlpha(255);
pal.setColor(scrollarea->viewport()->backgroundRole(), backgroundColor);
scrollarea->viewport()->setPalette(pal); scrollarea->viewport()->setPalette(pal);
} }
} }