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

QMacStyle - more pixel refinements 

There is 1 pixel of a rounded corner visible both on NSButton and
NSPopupButton in a tab widget (all orientations) - adjust the rectangle
for this.

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTBUG-86513
Change-Id: I5e203adc583d2fba6323b18328ccbc8b0c0666ea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Timur Pocheptsov 2020-10-26 16:12:41 +01:00
parent 7ae1dcbb04
commit 3857f104ca
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -3875,9 +3875,22 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
frameRect = frameRect.adjusted(-innerAdjust, 0, outerAdjust, 0);
else
frameRect = frameRect.adjusted(-outerAdjust, 0, innerAdjust, 0);
if (isSelected && isBigSurOrAbove) {
// 1 pixed of 'roundness' is still visible on the right
// (the left is OK, it's rounded).
frameRect = frameRect.adjusted(0, 0, 1, 0);
}
break;
case QStyleOptionTab::Middle:
frameRect = frameRect.adjusted(-innerAdjust, 0, innerAdjust, 0);
if (isSelected && isBigSurOrAbove) {
// 1 pixel of 'roundness' is still visible on both
// sides - left and right.
frameRect = frameRect.adjusted(-1, 0, 1, 0);
}
break;
case QStyleOptionTab::End:
// Pressed state hack: tweak adjustments in preparation for flip below
@ -3885,6 +3898,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
frameRect = frameRect.adjusted(-innerAdjust, 0, outerAdjust, 0);
else
frameRect = frameRect.adjusted(-outerAdjust, 0, innerAdjust, 0);
if (isSelected && isBigSurOrAbove) {
// 1 pixel of 'roundness' is still visible on the left.
frameRect = frameRect.adjusted(-1, 0, 0, 0);
}
break;
case QStyleOptionTab::OnlyOneTab:
frameRect = frameRect.adjusted(-outerAdjust, 0, outerAdjust, 0);