diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 10:57:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 10:57:30 (GMT) |
| commit | 71c84f0be1632a6c7b3cee7b55762e656c5a7826 (patch) | |
| tree | 6202ba83f5eaf82ec63b6d5e42525967a3a74a34 /src/gui | |
| parent | cf68bbef765b27753b8e81f82b6fc7d7733b12c0 (diff) | |
| parent | 8f59ff17926e246ff732ce40890a3a7625b8e826 (diff) | |
| download | Qt-71c84f0be1632a6c7b3cee7b55762e656c5a7826.zip Qt-71c84f0be1632a6c7b3cee7b55762e656c5a7826.tar.gz Qt-71c84f0be1632a6c7b3cee7b55762e656c5a7826.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
Diffstat (limited to 'src/gui')
| -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 38a4b7c..87d990e 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: { |