diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 13:56:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-07 13:56:56 (GMT) |
| commit | 20cd629268cdae457fe2a2fd2817f3b5bd5eb0ef (patch) | |
| tree | 433f817cd55876be6b27adc9617dd2315694eb51 /src/gui/styles/qmacstyle_mac.mm | |
| parent | 5bc75899fba0347005d2b03c3bdbaaa6b283c227 (diff) | |
| parent | 459dc4a3bf0dc0ac54fc558379fdf551949dd1c6 (diff) | |
| download | Qt-20cd629268cdae457fe2a2fd2817f3b5bd5eb0ef.zip Qt-20cd629268cdae457fe2a2fd2817f3b5bd5eb0ef.tar.gz Qt-20cd629268cdae457fe2a2fd2817f3b5bd5eb0ef.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix editable combobox style on Mac
Revert 344a4dcfe and part of 93bce787
Fix raster subpixel positioning in Lion
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 40c28f6..74e3440 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1195,15 +1195,15 @@ QRect QMacStylePrivate::comboboxEditBounds(const QRect &outerBounds, const HIThe QRect ret = outerBounds; switch (bdi.kind){ case kThemeComboBox: - ret.adjust(5, 8, -21, -4); + ret.adjust(5, 8, -22, -4); break; case kThemeComboBoxSmall: - ret.adjust(4, 5, -18, 0); - ret.setHeight(16); + ret.adjust(4, 6, -20, 0); + ret.setHeight(14); break; case kThemeComboBoxMini: - ret.adjust(4, 5, -16, 0); - ret.setHeight(13); + ret.adjust(4, 5, -18, -1); + ret.setHeight(12); break; case kThemePopupButton: ret.adjust(10, 3, -23, -3); |