projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e7a212
)
Fix editable combobox style on Mac
author
Jiang Jiang
<jiang.jiang@nokia.com>
Thu, 7 Jul 2011 12:53:09 +0000
(14:53 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 14 Jul 2011 11:08:20 +0000
(13:08 +0200)
Reviewed-by: Jens Bache-Wiig
(cherry picked from commit
459dc4a3bf0dc0ac54fc558379fdf551949dd1c6
)
Change-Id: I744722d46ced0c2b6139bc232a819d0d802eed0d
Reviewed-on: http://codereview.qt.nokia.com/1633
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
src/gui/styles/qmacstyle_mac.mm
patch
|
blob
|
history
diff --git
a/src/gui/styles/qmacstyle_mac.mm
b/src/gui/styles/qmacstyle_mac.mm
index
40c28f6
..
74e3440
100644
(file)
--- 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, -2
1
, -4);
+ ret.adjust(5, 8, -2
2
, -4);
break;
case kThemeComboBoxSmall:
- ret.adjust(4,
5, -18
, 0);
- ret.setHeight(1
6
);
+ ret.adjust(4,
6, -20
, 0);
+ ret.setHeight(1
4
);
break;
case kThemeComboBoxMini:
- ret.adjust(4, 5, -1
6, 0
);
- ret.setHeight(1
3
);
+ ret.adjust(4, 5, -1
8, -1
);
+ ret.setHeight(1
2
);
break;
case kThemePopupButton:
ret.adjust(10, 3, -23, -3);