diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2022-10-28 13:56:36 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2022-10-28 16:41:18 +0000 |
| commit | b690dcf2bd8d4bfb2c5fad8742f63b8d3a0bb735 (patch) | |
| tree | 9331132284e569bc5fb81b6c2d3052d9718f53ef /src/plugins/styles | |
| parent | 12cf77dc4813518a308227eedea2f4aaed1ffd0b (diff) | |
Revert "QMacStyle: paint PE_PanelScrollArea differently"
This reverts commit a43845b75a3eaed9cb0a323a9694c34a601286fb.
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>
Diffstat (limited to 'src/plugins/styles')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index a1af6a709d..d56b38a0d6 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -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; |