whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "QMacStyle: paint PE_PanelScrollArea differently" 

This reverts commit a43845b75a.

Reason for revert: As I can see from the pictures generated by the tests, the scroll bar now looks significantly worse and wrong.

Change-Id: I454b316b844839ebfc3f44633348e527e2a30f34
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Timur Pocheptsov 2022-10-28 13:56:36 +00:00
parent 12cf77dc48
commit b690dcf2bd
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/styles/mac/qmacstyle_mac.mm
View File

@ -3298,7 +3298,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
case PE_Frame: {
QPen oldPen = p->pen();
p->setPen(opt->palette.base().color().darker(140));
p->drawRect(opt->rect);
p->drawRect(opt->rect.adjusted(0, 0, -1, -1));
p->setPen(opt->palette.base().color().darker(180));
p->drawLine(opt->rect.topLeft(), opt->rect.topRight());
p->setPen(oldPen);
@ -3382,11 +3382,11 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
}
break;
case PE_PanelScrollAreaCorner: {
QBrush brush(opt->palette.brush(isDarkMode() ? QPalette::WindowText : QPalette::Base));
auto color(brush.color());
color.setAlphaF(isDarkMode() ? 0.059 : 0.76);
brush.setColor(color);
p->fillRect(opt->rect, color);
const QBrush brush(opt->palette.brush(QPalette::Base));
p->fillRect(opt->rect, brush);
p->setPen(QPen(QColor(217, 217, 217)));
p->drawLine(opt->rect.topLeft(), opt->rect.topRight());
p->drawLine(opt->rect.topLeft(), opt->rect.bottomLeft());
} break;
case PE_FrameStatusBarItem:
break;