summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qmacstyle_mac.mm
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
-rw-r--r--src/gui/styles/qmacstyle_mac.mm14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 77c337b..0cdd077 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -764,7 +764,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
if (!widg || !qobject_cast<QComboBox *>(widg->parentWidget())) {
//should I take into account the font dimentions of the lineedit? -Sam
if (sz == QAquaSizeLarge)
- ret = QSize(-1, 22);
+ ret = QSize(-1, 21);
else
ret = QSize(-1, 19);
}
@@ -1146,7 +1146,7 @@ HIRect QMacStylePrivate::comboboxInnerBounds(const HIRect &outerBounds, int butt
switch (buttonKind){
case kThemePopupButton:
innerBounds.origin.x += 2;
- innerBounds.origin.y += 3;
+ innerBounds.origin.y += 2;
innerBounds.size.width -= 5;
innerBounds.size.height -= 6;
break;
@@ -1164,9 +1164,9 @@ HIRect QMacStylePrivate::comboboxInnerBounds(const HIRect &outerBounds, int butt
break;
case kThemeComboBox:
innerBounds.origin.x += 3;
- innerBounds.origin.y += 3;
+ innerBounds.origin.y += 2;
innerBounds.size.width -= 6;
- innerBounds.size.height -= 6;
+ innerBounds.size.height -= 8;
break;
case kThemeComboBoxSmall:
innerBounds.origin.x += 3;
@@ -1195,7 +1195,7 @@ QRect QMacStylePrivate::comboboxEditBounds(const QRect &outerBounds, const HIThe
QRect ret = outerBounds;
switch (bdi.kind){
case kThemeComboBox:
- ret.adjust(5, 8, -22, -4);
+ ret.adjust(5, 5, -22, -5);
break;
case kThemeComboBoxSmall:
ret.adjust(4, 6, -20, 0);
@@ -1206,7 +1206,7 @@ QRect QMacStylePrivate::comboboxEditBounds(const QRect &outerBounds, const HIThe
ret.setHeight(12);
break;
case kThemePopupButton:
- ret.adjust(10, 3, -23, -3);
+ ret.adjust(10, 2, -23, -4);
break;
case kThemePopupButtonSmall:
ret.adjust(9, 3, -20, -3);
@@ -4403,7 +4403,7 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
if(widget->parentWidget() && qobject_cast<const QComboBox*>(widget->parentWidget()))
rect.adjust(-1, -2, 0, 0);
else
- rect.adjust(-1, 0, 0, +1);
+ rect.adjust(-1, -1, 0, +1);
break;
case SE_CheckBoxLayoutItem:
rect = opt->rect;