diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-27 02:31:52 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-27 02:31:52 (GMT) |
| commit | c4c6d2ac94e84c38b8ec6fc0710ff91fc04451fe (patch) | |
| tree | 2725edbde3512d6a8630eacbd4261574df606040 /util/s60pixelmetrics/pixel_metrics.cpp | |
| parent | d1b922bf2e80e04e33d293aeba2d74df060656b7 (diff) | |
| parent | e4f9e0410df863feddd43e3c813d30080eb2af0b (diff) | |
| download | Qt-c4c6d2ac94e84c38b8ec6fc0710ff91fc04451fe.zip Qt-c4c6d2ac94e84c38b8ec6fc0710ff91fc04451fe.tar.gz Qt-c4c6d2ac94e84c38b8ec6fc0710ff91fc04451fe.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'util/s60pixelmetrics/pixel_metrics.cpp')
| -rw-r--r-- | util/s60pixelmetrics/pixel_metrics.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp index 814e185..0fd650e 100644 --- a/util/s60pixelmetrics/pixel_metrics.cpp +++ b/util/s60pixelmetrics/pixel_metrics.cpp @@ -50,7 +50,7 @@ // so that we can keep dynamic and static values inline. // Please adjust version data if correcting dynamic PM calculations. const TInt KPMMajorVersion = 1; -const TInt KPMMinorVersion = 17; +const TInt KPMMinorVersion = 18; TPixelMetricsVersion PixelMetrics::Version() { @@ -1020,7 +1020,21 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric) break; case QStyle::PM_MenuScrollerHeight: - value = 0; + { + TRect rectParent( mainPaneRect ); + TAknLayoutRect listWidthScrollBarsRect; + listWidthScrollBarsRect.LayoutRect( rectParent, AknLayoutScalable_Avkon::listscroll_gen_pane(0).LayoutLine() ); + + TAknLayoutRect listWidgetRect; + listWidgetRect.LayoutRect( listWidthScrollBarsRect.Rect(), AknLayoutScalable_Avkon::list_gen_pane(0).LayoutLine() ); + TAknLayoutRect singleLineListWidgetRect; + singleLineListWidgetRect.LayoutRect( listWidgetRect.Rect(), AknLayoutScalable_Avkon::list_single_pane(0).LayoutLine() ); + + TAknLayoutRect listHighlightRect; + listHighlightRect.LayoutRect( singleLineListWidgetRect.Rect(), AknLayoutScalable_Avkon::list_highlight_pane_cp1(0).LayoutLine() ); + + value = listHighlightRect.Rect().Height(); + } break; // todo: re-check if these really are not available in s60 |