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

QMacStyle: correct placement of edit field in combobox

Browse Source 
The dark edit field is now centered within the frame around it, with a
thin border on all sides, including between input field and button.

Change-Id: I27e853289e9048c21fdc81e45fadacba9665b49e
Fixes: QTBUG-63454
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2019-12-03 15:14:59 +01:00
parent 4d796cbf17
commit e4d1a03df0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1740,16 +1740,16 @@ QRectF QMacStylePrivate::comboboxEditBounds(const QRectF &outerBounds, const Coc
if (cw.type == ComboBox) { if (cw.type == ComboBox) {
switch (cw.size) { switch (cw.size) {
case QStyleHelper::SizeLarge: case QStyleHelper::SizeLarge:
ret = ret.adjusted(0, 0, -28, 0).translated(3, 4.5); ret = ret.adjusted(0, 0, -25, 0).translated(2, 4.5);
ret.setHeight(16); ret.setHeight(16);
break; break;
case QStyleHelper::SizeSmall: case QStyleHelper::SizeSmall:
ret = ret.adjusted(0, 0, -24, 0).translated(3, 2); ret = ret.adjusted(0, 0, -22, 0).translated(2, 3);
ret.setHeight(14); ret.setHeight(14);
break; break;
case QStyleHelper::SizeMini: case QStyleHelper::SizeMini:
ret = ret.adjusted(0, 0, -21, 0).translated(2, 3); ret = ret.adjusted(0, 0, -19, 0).translated(2, 2.5);
ret.setHeight(11); ret.setHeight(10.5);
break; break;
default: default:
break; break;