diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-13 23:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-07-13 23:00:14 (GMT) |
| commit | 6da7e168c2caebd8164d7b69e74c2b9ded999dd7 (patch) | |
| tree | 4f176ef44294371ef45f48b7e2eae441711e51c1 /src/gui/styles | |
| parent | eff5ecc5d8f65fa25d6cfd6ed96a9d2a00d0c663 (diff) | |
| parent | 80b91ac5f579b5cc310366fb0ea4aa4c813c04bf (diff) | |
| download | Qt-6da7e168c2caebd8164d7b69e74c2b9ded999dd7.zip Qt-6da7e168c2caebd8164d7b69e74c2b9ded999dd7.tar.gz Qt-6da7e168c2caebd8164d7b69e74c2b9ded999dd7.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/styles')
| -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 321db25..8436856 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); |