summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-10-27 10:51:33 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-10-27 10:51:33 (GMT)
commitc17e8c19212d68a6bc2e9492b5ffacdf8c251090 (patch)
tree9df5c3a419e3fd4568b8febdcdafb77b71951bed /util
parentb9a48dd97e14b36a17590c4008ab5e94c1a734b8 (diff)
downloadQt-c17e8c19212d68a6bc2e9492b5ffacdf8c251090.zip
Qt-c17e8c19212d68a6bc2e9492b5ffacdf8c251090.tar.gz
Qt-c17e8c19212d68a6bc2e9492b5ffacdf8c251090.tar.bz2
Use PM_SplitterWidth in QS60Style
Updated pixel metrics values from latest S60 layouts. Also, updated pixel metrics harvester to collect pixel metric for QSplitter. Task-number: QT-686 Reviewed-by: Shane Kearns
Diffstat (limited to 'util')
-rw-r--r--util/s60pixelmetrics/pixel_metrics.cpp6
-rw-r--r--util/s60pixelmetrics/pm_mapper.mmp2
-rw-r--r--util/s60pixelmetrics/pm_mapperapp.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/util/s60pixelmetrics/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
index 939a718..9507c67 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 = 14;
+const TInt KPMMinorVersion = 15;
TPixelMetricsVersion PixelMetrics::Version()
{
@@ -726,6 +726,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
value = -1; //disable - not in S60
}
break;
+ case QStyle::PM_SplitterWidth:
case QStyle::PM_ScrollBarExtent:
{
TAknLayoutRect miscGraphicsRect;
@@ -1000,7 +1001,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
case QStyle::PM_ButtonShiftVertical:
value = 0;
break;
-
+
case QStyle::PM_ToolBarExtensionExtent:
value = PixelMetricTabValue(QStyle::PM_TabBarScrollButtonWidth, appWindow.Rect(), landscape);
break;
@@ -1016,7 +1017,6 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
case QStyle::PM_DockWidgetSeparatorExtent: // not in S60
case QStyle::PM_MdiSubWindowMinimizedWidth: //no such thing in S60
case QStyle::PM_HeaderGripMargin: // not in S60
- case QStyle::PM_SplitterWidth: // not in S60
case QStyle::PM_ToolBarSeparatorExtent: // not in S60
case QStyle::PM_ToolBarHandleExtent: // not in s60
case QStyle::PM_MenuButtonIndicator: // none???
diff --git a/util/s60pixelmetrics/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
index 7777a3d..a2e2571 100644
--- a/util/s60pixelmetrics/pm_mapper.mmp
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <data_caging_paths.hrh>
-#include <domain\osextensions\platform_paths.hrh>
+#include <platform_paths.hrh>
TARGET pm_mapper.exe
TARGETTYPE exe
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index e24ed29..de6af0d 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -138,7 +138,7 @@ void CPixelMetricsMapperAppUi::ConstructL()
//
TKeyResponse CPixelMetricsMapperAppUi::HandleKeyEventL(
const TKeyEvent& /*aKeyEvent*/,
- TEventCode aType )
+ TEventCode /*aType*/ )
{
return EKeyWasNotConsumed;
}