S60Style: List items should be taller for touch use (5th Edition)

This fixes private JIRA issue: QT-1479.
The change makes itemview items taller by twice the QStyle::PM_FocusFrameVMargin
amount (both margins) when touch is in use. It is rather curious that
the QCommonStyle modifies QRect for itemviews in horizontal direction
by twice the QStyle::PM_FocusFrameHMargin amount, but does not do it in
vertical direction.

Task-number: QT-1479 (private)
Reviewed-by: Alessandro Portale

1 files changed, 12 insertions, 3 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index b87f3a8..dc38397 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2266,10 +2266,19 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                 sz += QSize(2*f->lineWidth, 4*f->lineWidth);
             break;
         case CT_TabBarTab:
-            QSize naviPaneSize = QS60StylePrivate::naviPaneSize();
+            {
+                const QSize naviPaneSize = QS60StylePrivate::naviPaneSize();
+                sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget);
+                if (naviPaneSize.height() > sz.height())
+                    sz.setHeight(naviPaneSize.height());
+            }
+            break;
+        case CT_ItemViewItem:
             sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
-            if (naviPaneSize.height() > sz.height())
-                sz.setHeight(naviPaneSize.height());
+            if (QS60StylePrivate::isTouchSupported())
+                //Make itemview easier to use in touch devices
+                //QCommonStyle does not adjust height with horizontal margin, it only adjusts width
+                sz.setHeight(sz.height() + 2*pixelMetric(QStyle::PM_FocusFrameVMargin));
             break;
         default:
             sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);