diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 20:08:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 20:08:38 (GMT) |
| commit | c0cd8db0498daaa8151d1f80143b6849016bdc7c (patch) | |
| tree | f6760b80535a12e65775b9c818a1df1f82cf7e12 /src/gui/styles | |
| parent | 591131dca30622a2f7cd8e994a826384115edc84 (diff) | |
| parent | 659351bc2e49637a14359dccdafc3ed03b46e645 (diff) | |
| download | Qt-c0cd8db0498daaa8151d1f80143b6849016bdc7c.zip Qt-c0cd8db0498daaa8151d1f80143b6849016bdc7c.tar.gz Qt-c0cd8db0498daaa8151d1f80143b6849016bdc7c.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
Fix TextEdit mouseSelectionMode overriding selectByMouse.
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: { |