FCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiLayoutHandler.cpp

equal deleted inserted replaced

-:8466d47a6819
+:12c456ceeff2
 */
 // SYSTEM INCLUDE FILES
 #include "emailtrace.h"
-//#include <aknutils.h> <cmail>
-// <cmail> SF
 #include <alf/alftextstylemanager.h>
 #include <AknsUtils.h>
 #include <AknsSkinInstance.h>
 #include <alf/alfstatic.h>
-// <cmail> Platform layout change
 #include <aknlayoutscalable_apps.cdl.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <layoutmetadata.cdl.h>
-// </cmail>
 // For generic treelist layout data setting
-//<cmail>
 #include "fstreelist.h"
-//</cmail>
 // INTERNAL INCLUDE FILES
 #include "FreestyleEmailUiLayoutHandler.h"
 #include "FreestyleEmailUiLayoutData.h"
-// <cmail> Platform layout change
+const TInt KPopupMargin = 8;
 template< typename T >
 TUint32 GeneralHash( const T& aValue )
 {
 return DefaultHash::Des8( TPckgC< T >( aValue ) );
 }
 template< typename T >
 TBool GeneralPtrIdentity( const T& aP1, const T& aP2 )
 {
 return TPckgC< T >( aP1 ) == TPckgC< T >( aP2 );
 }
-// </cmail> Platform layout change
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::CFSEmailUiLayoutHandler
 // Base construction. May not leave.
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 CFSEmailUiLayoutHandler::~CFSEmailUiLayoutHandler()
 {
 FUNC_LOG;
-// <cmail> Platform layout change
 DeleteTextStyles();
-// </cmail> Platform layout change
-// <cmail>
 if ( iNormalTextStyle != KErrNotFound )
 {
 CAlfStatic::Env().TextStyleManager().DeleteTextStyle(
 iNormalTextStyle );
 }
 if( iSmallTextStyle != KErrNotFound )
 {
 CAlfStatic::Env().TextStyleManager().DeleteTextStyle(
 iSmallTextStyle );
 }
-// </cmail>
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ScreenResolution
 // Function can be used to fetch currently active screen resolution
 // -----------------------------------------------------------------------------
 //
 TScreenOrientation CFSEmailUiLayoutHandler::ScreenOrientation() const
 {
 FUNC_LOG;
-/*
-TScreenOrientation orientation = EPortrait;
-switch ( iScreenResolution )
-{
-case ELowResLandscape:
-case EQvgaLandscape:
-case EDrLandscape:
-case EVgaLandscape:
-case EHvgaLandscape:
-case EWideLandscape:
-orientation = ELandscape;
-break;
-case ELowResPortrait:
-case EQvgaPortrait:
-case EDrPortrait:
-case EVgaPortrait:
-case EHvgaPortrait:
-default:
-orientation = EPortrait;
-break;
-}
-return orientation;*/
 return Layout_Meta_Data::IsLandscapeOrientation() ? ELandscape : EPortrait;
 }
 // -----------------------------------------------------------------------------
 // CTeamUiAppLayoutHandler::ScreenResolutionChanged
 if ( AknsUtils::GetCachedColor( skin, textColor,
 KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 ) != KErrNone )
 {
 textColor = KRgbBlack;
 }
-/*
-// Should use EAknsCIFsTextColorsCG3 if background is white
-if ( AknsUtils::GetCachedColor( skin, textColor,
-KAknsIIDFsTextColors, EAknsCIFsTextColorsCG3 ) != KErrNone )
-{
-textColor = KRgbBlack;
-}
-*/
 return textColor;
 	}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GridIconSize
 TAknLayoutRect gridIconLRect;
 gridIconLRect.LayoutRect( itemRect.Rect(), AknLayoutScalable_Apps::cell_cmail_l_pane_g1( 0 ) );
 TSize iconSize = gridIconLRect.Rect().Size();
 return iconSize;
-/*
-	TInt iconSize(0);
-	switch ( iScreenResolution )
-		{
-		case EQvgaPortrait:
-			iconSize = KGridIconSizeInQvgaPort;
-	 		break;
-		case EQvgaLandscape:
-			iconSize = KGridIconSizeInQvgaLand;
-		 	break;
-		case EVgaPortrait:
-			iconSize = KGridIconSizeInVgaPort;
-			break;
-		case EVgaLandscape:
-			iconSize = KGridIconSizeInVgaLand;
-			break;
-		case EHvgaPortrait:
-			iconSize = KGridIconSizeInHvgaPort;
-			break;
-		case EHvgaLandscape:
-			iconSize = KGridIconSizeInHvgaLand;
-			break;
-		case EWideLandscape:
-			iconSize = KGridIconSizeInWideLand;
-			break;
-		case EDrPortrait:
-			iconSize = KGridIconSizeInDoubleResPort;
-			break;
-		case EDrLandscape:
-		default:
-			iconSize = KGridIconSizeInDoubleResLand;
-			break;
-		}
-	return iconSize;*/
-// </cmail>
 	}
 TSize CFSEmailUiLayoutHandler::MailIconSizeInThisResolution() const
 	{
 FUNC_LOG;
-// <cmail> Use layout data instead of hard-coded values
 	TAknLayoutRect rect;
 	rect.LayoutRect( TRect( 0, 0, 0, 0 ),
 	                AknLayoutScalable_Apps::list_single_dyc_row_pane_g1( 0 ).LayoutLine() );
 	return rect.Rect().Size();
-	/*TSize mailListIconSize(0,0);
-	switch ( iScreenResolution )
-		{
-		case EQvgaPortrait:
-			mailListIconSize = KMailListIconSizeInQvgaPort;
-	 		break;
-		case EQvgaLandscape:
-			mailListIconSize = KMailListIconSizeInQvgaLand;
-		 	break;
-		case EVgaPortrait:
-			mailListIconSize = KMailListIconSizeInVgaPort;
-			break;
-		case EVgaLandscape:
-			mailListIconSize = KMailListIconSizeInVgaLand;
-			break;
-		case EHvgaPortrait:
-			mailListIconSize = KMailListIconSizeInHvgaPort;
-			break;
-		case EHvgaLandscape:
-			mailListIconSize = KMailListIconSizeInHvgaLand;
-			break;
-		case EWideLandscape:
-			mailListIconSize = KMailListIconSizeInWideLand;
-			break;
-		case EDrPortrait:
-			mailListIconSize = KMailListIconSizeInDoubleResPort;
-			break;
-		case EDrLandscape:
-		default:
-			mailListIconSize = KMailListIconSizeInDoubleResLand;
-			break;
-		}
-	TAknUiZoom zoomLevel(EAknUiZoomNormal);
-CAknEnv::Static()->GetCurrentGlobalUiZoom( zoomLevel );
-	switch ( zoomLevel )
-		{
-		// Make icon a little bit smaller in small zoom
-		case EAknUiZoomSmall:
-			{
-			mailListIconSize.iHeight-=2;
-			mailListIconSize.iWidth-=2;
-			}
-			break;
-		case EAknUiZoomLarge:
-		case EAknUiZoomNormal:
-		default:
-			{
-			}
-			break;
-		}
-	return mailListIconSize;*/
-// </cmail> Use layout data instead of hard-coded values
 	}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::SetListMarqueeBehaviour
 {
 TAknWindowComponentLayout g1Layout( TAknWindowComponentLayout::Compose(
 AknLayoutScalable_Apps::list_single_dyc_row_pane( 0 ),
 AknLayoutScalable_Apps::list_single_dyc_row_pane_g1( 0 ) ) );
 TAknLayoutRect paneG1;
-paneG1.LayoutRect( DropDownMenuListRect( ELeft ), g1Layout.LayoutLine() );
+paneG1.LayoutRect( DropDownMenuListRect( ELeft, EFalse ), g1Layout.LayoutLine() );
 return paneG1.Rect().Size();
 }
 else
 {
 TRect mainPaneRect;
 return itemRect.Rect().Size();
 }
 }
-// <cmail>
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::FolderListPaneRectInThisResolution
 // Folder list pane rect, taken from Avkon layouts
 // -----------------------------------------------------------------------------
 //
 FUNC_LOG;
 TAknLayoutRect itemRect;
 itemRect.LayoutRect(aParent, AknLayoutScalable_Avkon::listscroll_gen_pane(0,0,0));
 return itemRect.Rect();
 }
-// </cmail>
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::FolderListIndentation
 // Folder list pane indentation in pixels, taken from Avkon layouts
 // -----------------------------------------------------------------------------
 	AknLayoutScalable_Avkon::list_single_large_graphic_pane( 0, 0 ,0 ) );
 return itemRect.Rect().Size();
 	}
-// <cmail>
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::DropDownMenuListRect
 // Selector ring image visual size
 // -----------------------------------------------------------------------------
 //
 TRect CFSEmailUiLayoutHandler::DropDownMenuListRect(
-const TDropDownMenuSide aSide ) const
+const TDropDownMenuSide aSide, TBool aStretch ) const
 {
 FUNC_LOG;
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
 mainPaneRect );
 mainPaneRect.Move( 0, -mainPaneRect.iTl.iY );
 TInt variety( aSide == ELeft ? 0 : 1 );
-if ( Layout_Meta_Data::IsLandscapeOrientation() )
+TBool landscape = Layout_Meta_Data::IsLandscapeOrientation();
+if ( landscape )
 {
 // landscape orientation variety is portrait + 2
 variety += 2;
 }
 AknLayoutScalable_Apps::popup_sp_fs_action_menu_pane_cp01( variety )
 ) );
 TAknLayoutRect menuPane;
 menuPane.LayoutRect( mainPaneRect, ddMenuPane.LayoutLine() );
-return menuPane.Rect();
+TRect rect = menuPane.Rect();
+if ( aStretch )
-}
+{
-// </cmail>
+rect.iBr.iY = mainPaneRect.iBr.iY;
+if( !landscape ) // landscape layout occupy the right side of the display
+{
+rect.iBr.iY -= ControlBarHeight();
+}
+}
+// Calculate the placement next to the button (below or left side)
+TRect buttonRect;
+TRect cbr = GetControlBarRect();
+if( aSide == ELeft )
+{
+buttonRect = GetControlBarFolderListButtonRect();
+}
+else
+{
+buttonRect = GetControlBarSortButtonRect();
+}
+buttonRect.Move( cbr.iTl ); // relative to control bar
+if( landscape )
+{
+TSize menuSize = rect.Size();
+// position left from the button
+rect.SetRect( TPoint( buttonRect.iTl.iX - menuSize.iWidth,
+buttonRect.Center().iY - menuSize.iHeight / 2 ), menuSize );
+}
+else
+{
+// position below the button
+rect.Move( 0, buttonRect.iBr.iY - rect.iTl.iY );
+}
+// keep the popup menu inside the screen area
+if( landscape )
+{
+if( rect.iTl.iX < KPopupMargin )
+{
+rect.Move( KPopupMargin - rect.iTl.iX , 0 );
+}
+if( rect.iBr.iY > mainPaneRect.iBr.iY - KPopupMargin )
+{
+rect.Move( 0, mainPaneRect.iBr.iY - rect.iBr.iY - KPopupMargin );
+}
+}
+if( rect.iTl.iY < KPopupMargin )
+{
+rect.iTl.iY = KPopupMargin;
+}
+return rect;
+}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::SelectorVisualSizeInThisResolution
 // Selector ring image visual size
 // -----------------------------------------------------------------------------
 FUNC_LOG;
 	//<cmail>
 TRect mainPaneRect;
 TAknLayoutRect listItem;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_dyc_row_pane( 0 ) );
+listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_fs_dyc_pane( 0 ) );
 return listItem.Rect().Height();
 //</cmail>
 	}
 // -----------------------------------------------------------------------------
 //
 TInt CFSEmailUiLayoutHandler::OneLineListItemHeight() const
 	{
 FUNC_LOG;
-	//<cmail>
 TRect mainPaneRect;
 TAknLayoutRect listItem;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_dyc_row_pane( 0 ) );
+listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_fs_dyc_pane( 0 ) );
 return listItem.Rect().Height();
-//</cmail>
+	}
-	}
+TInt CFSEmailUiLayoutHandler::TwoLineListItemHeight() const
+{
+TRect mainPaneRect;
+TAknLayoutRect listItem;
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
+listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_fs_dyc_pane( 1 ) );
+return listItem.Rect().Height();
+}
 //<cmail>
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::FolderListOneLineItemHeight
 // List item height for folder list
 // -----------------------------------------------------------------------------
 //
 TInt CFSEmailUiLayoutHandler::ControlBarHeight() const
 	{
 FUNC_LOG;
-	//<cmail>
 	TRect mainPaneRect;
 TAknLayoutRect ctrlBarRect;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
 ctrlBarRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane( 0 ) );
 return ctrlBarRect.Rect().Height();
-	//</cmail>
+	}
-	}
-// -----------------------------------------------------------------------------
-// CFSEmailUiLayoutHandler::ControlBarHeight
-// Control bar text height in twips
-// -----------------------------------------------------------------------------
-//
-/*
-TInt CFSEmailUiLayoutHandler::ControlBarTextHeight() const
-	{
-TRect mainPaneRect;
-TAknLayoutText ctrlBarText;
-TInt orientation( Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0 );
-AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-ctrlBarText.LayoutText( mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane_t1( orientation ) );
-return ctrlBarText.Font()->FontSpecInTwips().iHeight;
-	}
-*/
-//</cmail>  Platform layout change
 // <cmail> changes to avoid unnecessary creating new text styles objects.
 CAlfTextStyle* CFSEmailUiLayoutHandler::FSTextStyleFromIdL( TFSEmailFont aFontId )
 {
 FUNC_LOG;
 layoutRect.LayoutRect( ListCmailPaneRect(), AknLayoutScalable_Apps::list_single_cmail_header_detail_pane( 0 ) );
 layoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Apps::list_single_cmail_header_detail_pane_g2( 0 ) );
 return layoutRect.Rect().Size();
 // </cmail> Platform layout changes
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerActionMenuIconMargin
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ViewerActionMenuIconMargin() const
 {
 	FUNC_LOG;
-// <cmail> Platform layout changes
-/*
-return KViewerActionMenuIconMargin;
-*/
 	if (AknLayoutUtils::LayoutMirrored())
 	    {
 	    TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( ListCmailPaneRect(), AknLayoutScalable_Apps::list_single_cmail_header_detail_pane( 0 ) );
 TInt x( layoutRect.Rect().iTl.iX );
 layoutRect.LayoutRect( ListCmailPaneRect(), AknLayoutScalable_Apps::list_single_cmail_header_detail_pane( 0 ) );
 TInt x( layoutRect.Rect().iBr.iX );
 layoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Apps::list_single_cmail_header_detail_pane_g2( 0 ) );
 return Abs( x - layoutRect.Rect().iBr.iX );
 	    }
-// </cmail> Platform layout changes
+}
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerSelectorOpacity
 // -----------------------------------------------------------------------------
 TReal CFSEmailUiLayoutHandler::ViewerSelectorOpacity() const
 {
 FUNC_LOG;
 return KViewerSelectorOpacity;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerRightMarginInPixels
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ViewerRightMarginInPixels() const
 	{
 	FUNC_LOG;
-// <cmail> Platform layout changes
-/*
-if ( AknLayoutUtils::LayoutMirrored() )
-{
-return KViewerLeftMarginWidthInPixels;
-}
-else
-{
-return KViewerRightMarginWidthInPixels;
-}
-*/
 const TRect cmailPaneRect( ListCmailPaneRect() );
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( cmailPaneRect, AknLayoutScalable_Apps::list_single_cmail_header_caption_pane() );
 TAknLayoutText captionTextRect;
 captionTextRect.LayoutText( layoutRect.Rect(), AknLayoutScalable_Apps::list_single_cmail_header_caption_pane_t1() );
 return Abs( cmailPaneRect.iBr.iX - captionTextRect.TextRect().iBr.iX );
-// </cmail> Platform layout changes
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerLeftMarginInPixels
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ViewerLeftMarginInPixels() const
 	{
 	FUNC_LOG;
-// <cmail> Platform layout changes
-/*
-if ( AknLayoutUtils::LayoutMirrored() )
-{
-return KViewerRightMarginWidthInPixels;
-}
-else
-{
-return KViewerLeftMarginWidthInPixels;
-}
-*/
 const TRect cmailPaneRect( ListCmailPaneRect() );
 TAknLayoutRect layoutRect;
 layoutRect.LayoutRect( cmailPaneRect, AknLayoutScalable_Apps::list_single_cmail_header_caption_pane() );
 TAknLayoutText captionTextRect;
 captionTextRect.LayoutText( layoutRect.Rect(), AknLayoutScalable_Apps::list_single_cmail_header_caption_pane_t1() );
 return Abs( cmailPaneRect.iTl.iX - captionTextRect.TextRect().iTl.iX );
-// </cmail> Platform layout changes
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerWaterMarkSizeInThisResolution
 // -----------------------------------------------------------------------------
 		    sizeWithCurrentResolution = KViewerDefaultWaterMarkSizeInViewer;
 		    break;
 		}
 	return sizeWithCurrentResolution;
 	}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerWaterMarkPositionFromBottomRightCornerInThisResolution
 // -----------------------------------------------------------------------------
 TPoint CFSEmailUiLayoutHandler::ViewerWaterMarkPlaceFromBottomRightCornerInThisResolution() const
 	{
 		    placeFromBottomRightCorner = KViewerWaterMarkPositionFromBottomRightCorner;
 		    break;
 		}
 	return placeFromBottomRightCorner;
 	}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ComposerFieldBorderColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::ComposerFieldBorderColor() const
 {
 TRgb CFSEmailUiLayoutHandler::ComposerFieldBackgroundColor() const
 {
 FUNC_LOG;
 return GetSkinColor( KAknsIIDFsOtherColors, EAknsCIFsOtherColorsCG12, KRgbWhite );
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ComposerHeaderFieldTextColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::ComposerHeaderFieldTextColor() const
 {
 FUNC_LOG;
 return GetSkinColor( KAknsIIDFsTextColors, EAknsCIFsTextColorsCG4, KRgbBlack );
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ComposerBodyFieldTextColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::ComposerBodyFieldTextColor() const
 {
 FUNC_LOG;
 return GetSkinColor( KAknsIIDFsTextColors, EAknsCIFsTextColorsCG3, KRgbBlack );
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ComposerDimmedTextColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::ComposerDimmedTextColor() const
 {
 FUNC_LOG;
 return GetSkinColor( KAknsIIDFsTextColors, EAknsCIFsTextColorsCG18, KRgbGray );
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::MaxPcsMatches
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::MaxPcsMatches() const
 {
 FUNC_LOG;
 return KMaxPcsMatches;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::PcsPopupHighlightColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::PcsPopupHighlightColor() const
 {
 FUNC_LOG;
 return KPcsPopupHighlightColor;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::PcsPopupDimmedFontColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::PcsPopupDimmedFontColor() const
 {
 FUNC_LOG;
 return KPcsPopupDimmedFontColor;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ListTextureNodeExpandedSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ListTextureNodeExpandedSize() const
 {
 FUNC_LOG;
-//<cmail>
 TRect mainPaneRect;
 TAknLayoutRect listItem;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
 listItem.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::list_single_dyc_row_pane_g1( 0 ) );
 return listItem.Rect().Height();
-//return KListTextureNodeExpandedSize;
-//</cmail>
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::SearchLookingGlassIconSize
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ListControlBarMailboxDefaultIconSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ListControlBarMailboxDefaultIconSize() const
 {
 FUNC_LOG;
-// <cmail> Platform layout change
+return GetControlBarMailboxIconRect().Size().iWidth;
-//return KListControlBarMailboxDefaultIconSize;
+}
-return GetControlBarMailboxIconSize().iWidth;
-// </cmail> Platform layout change
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::EMailListBarBgIconSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::EMailListBarBgIconSize() const
 {
 FUNC_LOG;
-// <cmail> Platform layout change
 return GetControlBarRect().Size().iHeight;
-//return KEMailListBarBgIconSize;
+}
-// </cmail>
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ListTextureMailboxDefaultIconSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ListTextureMailboxDefaultIconSize() const
 {
 FUNC_LOG;
 return KListTextureMailboxDefaultIconSize;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::EListTextureSelectorSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::EListTextureSelectorSize() const
 {
 FUNC_LOG;
-// <cmail> Platform layout change
 return OneLineListItemHeight();
-//return KEListTextureSelectorSize;
+}
-// </cmail>
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ListControlMenuIconSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ListControlMenuIconSize() const
 {
 FUNC_LOG;
-// <cmail> Platform layout change
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 mainPaneRect.Move(-mainPaneRect.iTl);
 TAknLayoutRect controlBarRect;
 controlBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(0));
 TAknLayoutRect iconRect;
 iconRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane_g1(0));
 return iconRect.Rect().Height();
-//return KListControlMenuIconSize;
+}
-// </cmail>
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::AttachmentIconSize
 // -----------------------------------------------------------------------------
-// <cmail>
 TSize CFSEmailUiLayoutHandler::AttachmentIconSize() const
 {
 FUNC_LOG;
 TAknLayoutRect rect;
 rect.LayoutRect( TRect(0,0,0,0),
 AknLayoutScalable_Apps::list_single_dyc_row_pane_g1( 0 ).LayoutLine() );
 return rect.Rect().Size();
-//return KAttachmentIconSize;
+}
-// </cmail>
-}
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ViewerHighlightTextureSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ViewerHighlightTextureSize() const
 {
 FUNC_LOG;
 return KViewerHighlightTextureSize;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ControlBarArrowTextureXSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ControlBarArrowTextureXSize() const
 {
 FUNC_LOG;
 return KControlBarArrowTextureXSize;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::ControlBarArrowTextureYSize
 // -----------------------------------------------------------------------------
 TInt CFSEmailUiLayoutHandler::ControlBarArrowTextureYSize() const
 {
 FUNC_LOG;
 return KControlBarArrowTextureYSize;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetSkinColor
 // -----------------------------------------------------------------------------
 TRgb CFSEmailUiLayoutHandler::GetSkinColor( const TAknsItemID& aId,
 TInt aIndex, const TRgb& aFallbackColor ) const
 color = aFallbackColor;
 }
 return color;
 }
-// <cmail> Use layout data instead of hardcoded values
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetControlBarMailboxIconRect
 // -----------------------------------------------------------------------------
 TRect CFSEmailUiLayoutHandler::GetControlBarMailboxIconRect() const
 }
 else
 {
 iconRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane_g1(0));
 }
 return iconRect.Rect();
 }
 // -----------------------------------------------------------------------------
-// CFSEmailUiLayoutHandler::GetControlBarMailboxIconPos
+TRect CFSEmailUiLayoutHandler::GetControlBarNewEmailButtonRect() const
-// -----------------------------------------------------------------------------
+{
-TPoint CFSEmailUiLayoutHandler::GetControlBarMailboxIconPos() const
+FUNC_LOG;
-{
+TAknLayoutRect iconRect;
-FUNC_LOG;
+TRect cbr = GetControlBarRect();
-return GetControlBarMailboxIconRect().iTl;
+if( Layout_Meta_Data::IsLandscapeOrientation() )
-}
+{
+iconRect.LayoutRect( cbr,
-// -----------------------------------------------------------------------------
+AknLayoutScalable_Apps::cmail_ddmenu_btn02_pane(3) );
-// CFSEmailUiLayoutHandler::GetControlBarMailboxIconSize
+}
-// -----------------------------------------------------------------------------
+else
-TSize CFSEmailUiLayoutHandler::GetControlBarMailboxIconSize() const
+{
-{
+if ( AknLayoutUtils::LayoutMirrored() )
-FUNC_LOG;
+{
-return GetControlBarMailboxIconRect().Size();
+iconRect.LayoutRect( cbr,
+AknLayoutScalable_Apps::cmail_ddmenu_btn03_pane(2) );
+}
+else
+{
+iconRect.LayoutRect( cbr,
+AknLayoutScalable_Apps::cmail_ddmenu_btn01_pane(2) );
+}
+}
+TRect rect = iconRect.Rect();
+rect.Move( -cbr.iTl );
+return rect;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetControlBarFolderListButtonRect
 // -----------------------------------------------------------------------------
 TRect CFSEmailUiLayoutHandler::GetControlBarFolderListButtonRect() const
 {
 FUNC_LOG;
-TRect mainPaneRect;
-AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
-mainPaneRect.Move(-mainPaneRect.iTl);
-TAknLayoutRect controlBarRect;
-controlBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(0));
 TAknLayoutRect folderListButtonRect;
-if ( AknLayoutUtils::LayoutMirrored() )
+TRect cbr = GetControlBarRect();
-{
+if( Layout_Meta_Data::IsLandscapeOrientation() )
-folderListButtonRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_button_pane_cp01(0));
+{
+folderListButtonRect.LayoutRect( cbr,
+AknLayoutScalable_Apps::cmail_ddmenu_btn02_pane_cp1(3) );
 }
 else
 {
-folderListButtonRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_ddmenu_pane(0));
+folderListButtonRect.LayoutRect( cbr,
-}
+AknLayoutScalable_Apps::cmail_ddmenu_btn02_pane(2) );
-return folderListButtonRect.Rect();
+}
-}
+TRect rect = folderListButtonRect.Rect();
-// -----------------------------------------------------------------------------
+rect.Move( -cbr.iTl );
-// CFSEmailUiLayoutHandler::GetControlBarFolderListButtonPos
+return rect;
-// -----------------------------------------------------------------------------
-TPoint CFSEmailUiLayoutHandler::GetControlBarFolderListButtonPos() const
-{
-FUNC_LOG;
-return GetControlBarFolderListButtonRect().iTl;
-}
-// -----------------------------------------------------------------------------
-// CFSEmailUiLayoutHandler::GetControlBarFolderListButtonSize
-// -----------------------------------------------------------------------------
-TSize CFSEmailUiLayoutHandler::GetControlBarFolderListButtonSize() const
-{
-FUNC_LOG;
-return GetControlBarFolderListButtonRect().Size();
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetControlBarSortButtonRect
 // -----------------------------------------------------------------------------
 TRect CFSEmailUiLayoutHandler::GetControlBarSortButtonRect() const
 {
 FUNC_LOG;
-TRect mainPaneRect;
-AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
-mainPaneRect.Move(-mainPaneRect.iTl);
-TAknLayoutRect controlBarRect;
-controlBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(0));
 TAknLayoutRect sortButtonRect;
-if ( AknLayoutUtils::LayoutMirrored() )
+TRect cbr = GetControlBarRect();
-{
+if( Layout_Meta_Data::IsLandscapeOrientation() )
-sortButtonRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_ddmenu_pane(0));
+{
+sortButtonRect.LayoutRect( cbr,
+AknLayoutScalable_Apps::cmail_ddmenu_btn02_pane_cp2(3) );
 }
 else
 {
-sortButtonRect.LayoutRect(controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_button_pane_cp01(0));
+if ( AknLayoutUtils::LayoutMirrored() )
-}
+{
-return sortButtonRect.Rect();
+sortButtonRect.LayoutRect( cbr,
-}
+AknLayoutScalable_Apps::cmail_ddmenu_btn01_pane(2) );
+}
-// -----------------------------------------------------------------------------
+else
-// CFSEmailUiLayoutHandler::GetControlBarSortButtonPos
+{
-// -----------------------------------------------------------------------------
+sortButtonRect.LayoutRect( cbr,
-TPoint CFSEmailUiLayoutHandler::GetControlBarSortButtonPos() const
+AknLayoutScalable_Apps::cmail_ddmenu_btn03_pane(2) );
-{
+}
-FUNC_LOG;
+}
-return GetControlBarSortButtonRect().iTl;
-}
+TRect r = sortButtonRect.Rect();
+r.Move( -cbr.iTl );
-// -----------------------------------------------------------------------------
+return r;
-// CFSEmailUiLayoutHandler::GetControlBarSortButtonSize
-// -----------------------------------------------------------------------------
-TSize CFSEmailUiLayoutHandler::GetControlBarSortButtonSize() const
-{
-FUNC_LOG;
-return GetControlBarSortButtonRect().Size();
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetControlBarConnectionIconRect
 // -----------------------------------------------------------------------------
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 mainPaneRect.Move(-mainPaneRect.iTl);
 TAknLayoutRect controlBarRect;
 controlBarRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(0 ) );
 TAknLayoutRect iconRect;
-// <cmail>
 if ( AknLayoutUtils::LayoutMirrored() )
 {
 iconRect.LayoutRect( controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane_g1( 0 ) );
 }
 else
 {
 iconRect.LayoutRect( controlBarRect.Rect(), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane_g2( 0 ) );
 }
-// </cmail>
 return iconRect.Rect();
 }
 // -----------------------------------------------------------------------------
-// CFSEmailUiLayoutHandler::GetControlBarConnectionIconPos
-// -----------------------------------------------------------------------------
-TPoint CFSEmailUiLayoutHandler::GetControlBarConnectionIconPos() const
-{
-FUNC_LOG;
-return GetControlBarConnectionIconRect().iTl;
-}
-// -----------------------------------------------------------------------------
-// CFSEmailUiLayoutHandler::GetControlBarConnectionIconSize
-// -----------------------------------------------------------------------------
-TSize CFSEmailUiLayoutHandler::GetControlBarConnectionIconSize() const
-{
-FUNC_LOG;
-return GetControlBarConnectionIconRect().Size();
-}
-// -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetControlBarRect
 // -----------------------------------------------------------------------------
 TRect CFSEmailUiLayoutHandler::GetControlBarRect() const
 {
 FUNC_LOG;
-//TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0; //<cmail>
+TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 3 : 2;
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 mainPaneRect.Move(-mainPaneRect.iTl);
+TRect emailRect = mainPaneRect;
+TAknLayoutRect emailPaneRect;
+emailPaneRect.LayoutRect(mainPaneRect,
+AknLayoutScalable_Apps::main_sp_fs_email_pane());
+emailRect = emailPaneRect.Rect();
 TAknLayoutRect controlBarRect;
-controlBarRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(0)); //<cmail>
+controlBarRect.LayoutRect( emailRect,
-return controlBarRect.Rect();
+AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane(var));
-}
+TRect rect = controlBarRect.Rect();
-// -----------------------------------------------------------------------------
+return rect;
-// CFSEmailUiLayoutHandler::GetControlBarRect
+}
-// -----------------------------------------------------------------------------
-TRect CFSEmailUiLayoutHandler::GetListRect() const
+// -----------------------------------------------------------------------------
-{
+// CFSEmailUiLayoutHandler::GetListRect
-FUNC_LOG;
+// -----------------------------------------------------------------------------
+TRect CFSEmailUiLayoutHandler::GetListRect( TBool aControlsOnTop ) const
+{
+FUNC_LOG;
+TBool landscape = Layout_Meta_Data::IsLandscapeOrientation();
+TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 3 : 2;
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 mainPaneRect.Move(-mainPaneRect.iTl);
 TAknLayoutRect listRect;
-listRect.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_listscroll_pane_te_cp01( 0 ) );
+listRect.LayoutRect( mainPaneRect,
-return listRect.Rect();
+AknLayoutScalable_Apps::main_sp_fs_listscroll_pane_te_cp01( var ));
+TRect rect = listRect.Rect();
+// if control bar is required, reserve space on top of the listbox
+if( aControlsOnTop && landscape )
+{
+TAknLayoutRect listRect2;
+listRect2.LayoutRect( mainPaneRect,
+AknLayoutScalable_Apps::main_sp_fs_listscroll_pane_te_cp01( 0 ));
+rect.Intersection(listRect2.Rect());
+}
+return rect;
 }
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::GetSearchListHeaderTextLayout
 // -----------------------------------------------------------------------------
 TAknLayoutText CFSEmailUiLayoutHandler::GetSearchListHeaderTextLayout() const
 {
 FUNC_LOG;
-//TInt var = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
 TRect mainPaneRect;
 AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EMainPane, mainPaneRect);
 mainPaneRect.Move(-mainPaneRect.iTl);
 TAknLayoutRect headerRect;
 headerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Apps::main_sp_fs_ctrlbar_pane());
 layoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Apps::listscroll_cmail_pane() );
 layoutRect.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Apps::list_cmail_pane() );
 return layoutRect.Rect();
 }
-// </cmail> Platform layout change
-// <cmail> new methods
 // -----------------------------------------------------------------------------
 // CFSEmailUiLayoutHandler::TitleCaptionPadding
 //
 // Returns padding value for title caption visual
 // -----------------------------------------------------------------------------
 const TRect menuListPaneRect( menuListPane.Rect() );
 return Abs( menuListPaneRect.iTl.iY - menuPaneRect.iTl.iY );
 }
-// </cmail>
 // End of file

changeset 1	12c456ceeff2
parent 0	8466d47a6819
child 13	0396474f30f5