diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 16:21:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 16:21:32 (GMT) |
| commit | 659351bc2e49637a14359dccdafc3ed03b46e645 (patch) | |
| tree | 12f3a3ef6be31079a92776994334de258b549bc2 /src/gui/styles | |
| parent | 5662cda2d836f448d036ed516d0b9a2795f6905c (diff) | |
| parent | 71c84f0be1632a6c7b3cee7b55762e656c5a7826 (diff) | |
| download | Qt-659351bc2e49637a14359dccdafc3ed03b46e645.zip Qt-659351bc2e49637a14359dccdafc3ed03b46e645.tar.gz Qt-659351bc2e49637a14359dccdafc3ed03b46e645.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index ecc2539..c107511 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2643,10 +2643,13 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget); //native items have small empty areas at the beginning and end of menu item sz.setWidth(sz.width() + 2 * pixelMetric(PM_MenuHMargin) + 2 * QS60StylePrivate::pixelMetric(PM_FrameCornerWidth)); - if (QS60StylePrivate::isTouchSupported()) + if (QS60StylePrivate::isTouchSupported()) { //Make itemview easier to use in touch devices + sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin)); //QCommonStyle does not adjust height with horizontal margin, it only adjusts width - sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin) - 8); //QCommonstyle adds 8 to height that this style handles through PM values + if (ct == CT_MenuItem) + sz.setHeight(sz.height() - 8); //QCommonstyle adds 8 to height that this style handles through PM values + } break; #ifndef QT_NO_COMBOBOX case CT_ComboBox: { |