summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--util/s60pixelmetrics/bld.inf (renamed from util/s60pixelmetrics/pixelmetricsmapper/bld.inf)0
-rw-r--r--util/s60pixelmetrics/pixel_metrics.cpp (renamed from util/s60pixelmetrics/src/pixel_metrics.cpp)16
-rw-r--r--util/s60pixelmetrics/pixel_metrics.h (renamed from util/s60pixelmetrics/inc/pixel_metrics.h)2
-rw-r--r--util/s60pixelmetrics/pm_mapper.hrh (renamed from util/s60pixelmetrics/pixelmetricsmapper/PMMapper.hrh)0
-rw-r--r--util/s60pixelmetrics/pm_mapper.mmp (renamed from util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.mmp)7
-rw-r--r--util/s60pixelmetrics/pm_mapper.pkg (renamed from util/s60pixelmetrics/pixelmetricsmapper/pmmapper.pkg)0
-rw-r--r--util/s60pixelmetrics/pm_mapper.rss (renamed from util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.rss)2
-rw-r--r--util/s60pixelmetrics/pm_mapper_reg.rss (renamed from util/s60pixelmetrics/pixelmetricsmapper/pm_mapper_reg.rss)0
-rw-r--r--util/s60pixelmetrics/pm_mapperapp.cpp (renamed from util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.cpp)30
-rw-r--r--util/s60pixelmetrics/pm_mapperapp.h (renamed from util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.h)0
-rw-r--r--util/s60pixelmetrics/pm_mapperview.cpp (renamed from util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.cpp)6
-rw-r--r--util/s60pixelmetrics/pm_mapperview.h (renamed from util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.h)0
12 files changed, 34 insertions, 29 deletions
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/bld.inf b/util/s60pixelmetrics/bld.inf
index 748e8810..748e8810 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/bld.inf
+++ b/util/s60pixelmetrics/bld.inf
diff --git a/util/s60pixelmetrics/src/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
index f71a266..8925ebe 100644
--- a/util/s60pixelmetrics/src/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 = 13;
+const TInt KPMMinorVersion = 14;
TPixelMetricsVersion PixelMetrics::Version()
{
@@ -295,17 +295,21 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
B is gap between icon and text
C is right padding
*/
+
TRect rectParent( mainPaneRect );
TAknLayoutRect layoutRect;
- layoutRect.LayoutRect( rectParent,AknLayoutScalable_Avkon::list_set_graphic_pane(0).LayoutLine() );
+ layoutRect.LayoutRect( rectParent, AknLayoutScalable_Avkon::listscroll_gen_pane(0).LayoutLine() );
+
TAknLayoutRect layoutRect2;
+ layoutRect2.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Avkon::list_gen_pane(0).LayoutLine() );
TAknLayoutRect layoutRect3;
- layoutRect2.LayoutRect( layoutRect.Rect(),AknLayoutScalable_Avkon::set_content_pane().LayoutLine() );
+ layoutRect3.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane(0).LayoutLine() );
TAknLayoutText itemText;
- itemText.LayoutText( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_set_graphic_pane_t1(0) );
+ itemText.LayoutText( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_t1(0) );
TAknLayoutRect iconLayoutRect;
- iconLayoutRect.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_set_graphic_pane_g1(0).LayoutLine() );
+ iconLayoutRect.LayoutRect( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_g1(0).LayoutLine() );
+
if ( !AknLayoutUtils::LayoutMirrored() )
{
value = itemText.TextRect().iTl.iX - iconLayoutRect.Rect().iBr.iX;
@@ -973,6 +977,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
value = inputFocusRect.Rect().iBr.iX - inputFocusInnerRect.Rect().iBr.iX;
+ value+= 2; //visually better value for generic cases
}
break;
case QStyle::PM_Custom_FrameCornerHeight:
@@ -982,6 +987,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
TAknLayoutRect inputFocusInnerRect;
inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
value = inputFocusRect.Rect().iBr.iY - inputFocusInnerRect.Rect().iBr.iY;
+ value+= 2; //visually better value for generic cases
}
break;
case QStyle::PM_Custom_BoldLineWidth:
diff --git a/util/s60pixelmetrics/inc/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
index 7235bda..692564c 100644
--- a/util/s60pixelmetrics/inc/pixel_metrics.h
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -43,7 +43,7 @@
#define PIXELMETRICS_H
#include <e32base.h>
-//#define S60_Rnd_Env
+#define S60_Rnd_Env
#ifdef S60_Rnd_Env
#pragma message ("Building in supported environment")
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapper.hrh b/util/s60pixelmetrics/pm_mapper.hrh
index afd47db..afd47db 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapper.hrh
+++ b/util/s60pixelmetrics/pm_mapper.hrh
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
index fe55fc9..a277404 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.mmp
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -50,9 +50,9 @@ CAPABILITY CAP_APPLICATION
VENDORID VID_DEFAULT
SOURCEPATH .
-SOURCE pmmapperview.cpp
-SOURCE pmmapperapp.cpp
-SOURCE ..\src\pixel_metrics.cpp
+SOURCE pm_mapperview.cpp
+SOURCE pm_mapperapp.cpp
+SOURCE pixel_metrics.cpp
START RESOURCE pm_mapper.rss
HEADER
@@ -65,7 +65,6 @@ END
APP_LAYER_SYSTEMINCLUDE
USERINCLUDE .
-USERINCLUDE ..\inc
LIBRARY eikcoctl.lib
LIBRARY avkon.lib
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pmmapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg
index 1f2e38f..1f2e38f 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pmmapper.pkg
+++ b/util/s60pixelmetrics/pm_mapper.pkg
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
index 60c15a8..8543271 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.rss
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -55,7 +55,7 @@ NAME TATR
#include <data_caging_paths_strings.hrh>
#include <appinfo.rh>
-#include "pmmapper.hrh"
+#include "pm_mapper.hrh"
// RESOURCE DEFINITIONS
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper_reg.rss b/util/s60pixelmetrics/pm_mapper_reg.rss
index d21a2c8..d21a2c8 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper_reg.rss
+++ b/util/s60pixelmetrics/pm_mapper_reg.rss
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index de0b753..e699019 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -43,9 +43,9 @@
#include <avkon.rsg>
#include <avkon.hrh>
-#include "pmmapper.hrh"
-#include "pmmapperApp.h"
-#include "pmmapperView.h"
+#include "pm_mapper.hrh"
+#include "pm_mapperapp.h"
+#include "pm_mapperview.h"
#include <pm_mapper.rsg>
#include <BldVariant.hrh>
@@ -290,7 +290,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
case ECmdSwitchOrientation:
{
ClearL();
- #ifndef __SERIES60_31__
+ #ifndef __SERIES60_31__
if (!iAvkonAppUi->OrientationCanBeChanged())
{
HBufC* buffer = HBufC::NewLC( 100 );
@@ -301,7 +301,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
bufferPtr.Zero();
delete buffer;
}
- #endif //__SERIES60_31__
+ #endif //__SERIES60_31__
if ( iAvkonAppUi->Orientation() == CAknAppUiBase::EAppUiOrientationPortrait)
{
iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
@@ -402,16 +402,16 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
}
}
void CPixelMetricsMapperAppUi::DoAutoOperationL()
- {
- HandleCommandL(ECmdStartCalculations);
- iMode = EFalse;
- HandleCommandL(ECmdSwitchMirroring);
- }
+ {
+ HandleCommandL(ECmdStartCalculations);
+ iMode = EFalse;
+ HandleCommandL(ECmdSwitchMirroring);
+ }
TBool CPixelMetricsMapperAppUi::ReadyForAutoOp() const
- {
- return (iAutoMode && iMode);
- }
+ {
+ return (iAutoMode && iMode);
+ }
// -----------------------------------------------------------------------------
//
@@ -853,9 +853,9 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
else
{
if (nextValue == -909)
- bufferPMData.Append(_L("ECommonStyleValue"));
+ bufferPMData.Append(_L("ECommonStyleValue"));
else
- bufferPMData.AppendNum(nextValue);
+ bufferPMData.AppendNum(nextValue);
}
oneline.Zero();
loop++;
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.h b/util/s60pixelmetrics/pm_mapperapp.h
index 02d297e..02d297e 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.h
+++ b/util/s60pixelmetrics/pm_mapperapp.h
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.cpp b/util/s60pixelmetrics/pm_mapperview.cpp
index 9d5d668..f7ab2ac 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.cpp
+++ b/util/s60pixelmetrics/pm_mapperview.cpp
@@ -46,10 +46,10 @@
#include <aknviewappui.h>
#include <aknconsts.h>
-#include "pmmapper.hrh"
+#include "pm_mapper.hrh"
#include <pm_mapper.rsg>
-#include "pmmapperView.h"
-#include "pmmapperApp.h"
+#include "pm_mapperView.h"
+#include "pm_mapperApp.h"
#include <aknlists.h>
#include <avkon.hrh>
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.h b/util/s60pixelmetrics/pm_mapperview.h
index e9eb42e..e9eb42e 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.h
+++ b/util/s60pixelmetrics/pm_mapperview.h
generated by cgit v0.12 at 2024-12-04 20:49:52 (GMT)