MCL/sf/app/commonemail: comparison meetingrequest/mrgui/src/cesmrview.cpp

equal deleted inserted replaced

-:b13141f05c3d
+:b5fbb9b25d57
 *
 * Description:  ESMR UI Container class
 *
 */
-// <cmail> custom sw help files not avilable in Cmail
-//#include <fscale.hlp.hrh> //for custom_sw helps
-//#include <fsmr.hlp.hrh> //for custom_sw helps
-// </cmail>
 #include "cesmrview.h"
 #include "mesmrmeetingrequestentry.h"
 #include "esmrinternaluid.h"
 #include "cesmrtitlepane.h"
 #include "cesmrfield.h"
 #include "mesmrfieldevent.h"
 #include "cesmrgenericfieldevent.h"
 #include <eiklabel.h>
 #include <avkon.hrh>
-#include <magnentryui.h>
+#include <MAgnEntryUi.h>
-#include <stringloader.h>
+#include <StringLoader.h>
 #include <gulcolor.h>
 #include <eikimage.h>
 #include <esmrgui.rsg>
-#include <akniconutils.h>
+#include <AknIconUtils.h>
 #include <eikenv.h>
-#include <aknsconstants.h>
+#include <AknsConstants.h>
-#include <aknutils.h>
+#include <AknUtils.h>
-#include <aknsdrawutils.h>
+#include <AknsDrawUtils.h>
-#include <aknsbasicbackgroundcontrolcontext.h>
+#include <AknsBasicBackgroundControlContext.h>
 #include <hlplch.h>
 #include <csxhelp/cmail.hlp.hrh>
 #include <touchfeedback.h>
 #include <akntoolbar.h>
 #include <eikcolib.h>
 #include <featdiscovery.h>
 #include <bldvariant.hrh>
 #include <layoutmetadata.cdl.h>
 #include "emailtrace.h"
-// <cmail> Removed profiling. </cmail>
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // CESMRView::CESMRView()
 }
 delete iAttachmentIndicator;
 iAttachmentIndicator = NULL;
-ReLayout();
+SizeChanged();
 }
 }
 break;
 default://forward to fields
 	{
 LaunchHelpL( KFS_VIEWER_HLP_MEETING_REQ_VIEW );
 }
 else
 {
 // Only viewer from Mail supported
-// TODO: Change to KFS_VIEWER_HLP_MR_RECEIVED
+LaunchHelpL( KFS_VIEWER_HLP_MR_RECEIVED );
-// when help id is released on wk9 platform
-LaunchHelpL( KFS_VIEWER_HLP_MEETING_REQ_VIEW );
 }
 }
 else if ( mrEntry->RoleL() == EESMRRoleOrganizer )
 {
 LaunchHelpL( KFSCA_HLP_VIEWER_ORGANIZER );
 // If list pane is not yet constructed, no point in layouting anything
 if( !iListPane )
 {
 return;
 }
-TRect containerRect( Rect() );
+// Remove possible intersection with toolbar from container rect
+TRect containerRect( ContainerRect() );
+// Now toolbar does not intersect with view, so it must not be taken
+// into account when calculating other component layouts.
+containerRect.SetRect( TPoint( 0, 0 ), containerRect.Size() );
 // Get the rect of stripe.
 TAknLayoutRect stripeLayoutRect =
 NMRLayoutManager::GetLayoutRect( containerRect,
 NMRLayoutManager::EMRLayoutStripe );
 NMRLayoutManager::GetLayoutRect( containerRect,
 NMRLayoutManager::EMRLayoutListArea );
 TRect listareaRect( listareaLayoutRect.Rect() );
 // List panes default rect needs to be modified due to
-// possible toolbar, scrollbar and calendar indication stripe
+// scrollbar and calendar indication stripe
 // Remove stripe width from list pane width
 listareaRect.iTl.iX += iStripeRect.Width();
-// Remove toolbar width from list pane width
-listareaRect.iBr.iX -= iToolbar.Rect().Width();
 if( iScrollBar )
 {
 TAknLayoutRect scrollareaLayoutRect =
 NMRLayoutManager::GetLayoutRect( containerRect,
 NMRLayoutManager::EMRLayoutScrollBar );
 TRect scrollareaRect( scrollareaLayoutRect.Rect() );
 // Scroll bar's height is always the same as listpane's height
 scrollareaRect.SetHeight( listareaRect.Height() );
-// Scrollbar needs to be moved to the left side of possible
-// toolbar
-scrollareaRect.Move( -iToolbar.Rect().Width(), 0 );
 iScrollBar->SetRect( scrollareaRect );
 // Remove scroll bar width from list area's width
 listareaRect.iBr.iX -= iScrollBar->Rect().Width();
 }
 if( iScrollBar )
 {
 scrollWidth = iScrollBar->Rect().Width();
 }
-naviArrowRightRect.Move(
+naviArrowRightRect.Move( scrollWidth, 0 );
--( iToolbar.Rect().Width() + scrollWidth ), 0 );
 iNaviArrowRight->SetRect( naviArrowRightRect );
 }
 }
 else
 NMRLayoutManager::EMRLayoutListArea );
 TRect listareaRect( listareaLayoutRect.Rect() );
 // The listPane's area should be:
 // X: Should subtract the width of stripe
-// Y: Should subtract the height of MRToolbar
 listareaRect.iTl.iX += iStripeRect.Width();
-listareaRect.iBr.iY -= iToolbar.Rect().Height();
 iListPane->SetRect( listareaRect );
 if( iScrollBar )
 {
 // Left arrow needs to be moved right the amount of
 // stripe width in portrait
 naviArrowLeftRect.Move( iStripeRect.Width(), 0 );
-// Left arrow needs to be moved up the amount of
-// possible toolbar height in portrait
-naviArrowLeftRect.Move( 0, -iToolbar.Rect().Height() );
 iNaviArrowLeft->SetRect( naviArrowLeftRect );
 }
 if( iNaviArrowRight )
 {
 // Right arrow needs to be moved right the amount of
 // stripe width in portrait
 naviArrowRightRect.Move( iStripeRect.Width(), 0 );
-// Right arrow needs to be moved up the amount of
-// possible toolbar height in portrait
-naviArrowRightRect.Move( 0, -iToolbar.Rect().Height() );
 iNaviArrowRight->SetRect( naviArrowRightRect );
 }
 }
 else
 {
 }
 case KEikDynamicLayoutVariantSwitch:
 case KAknLocalZoomLayoutSwitch:
 {
 SizeChanged();
-DrawNow();
 break;
 }
 default:
 {
 break;
 TESMRViewMode CESMRView::GetViewMode()
 	{
 FUNC_LOG;
 	return iViewMode;
 	}
-// ---------------------------------------------------------------------------
-// CESMRView::ReLayout
-// ---------------------------------------------------------------------------
-//
-void CESMRView::ReLayout()
-{
-FUNC_LOG;
-SizeChanged();
-}
 // ---------------------------------------------------------------------------
 // CESMRView::ProcessEventL
 // ---------------------------------------------------------------------------
 //
 static_cast< MESMRFieldEventValue* >( aEvent.Param( 1 ) );
 iAttachmentIndicator->SetTextL( value->StringValue() );
 iAttachmentIndicator->MakeVisible( ETrue );
-ReLayout();
+SizeChanged();
 }
 }
 }
 // ---------------------------------------------------------------------------
 // CESMRView::CalculateAttachmentIndicatorLayout
 // ---------------------------------------------------------------------------
 //
 TRect CESMRView::CalculateAttachmentIndicatorLayout()
 {
-TRect containerRect( Rect() );
+TRect containerRect( ContainerRect() );
 TAknLayoutRect naviArrowLeftLayoutRect =
 NMRLayoutManager::GetLayoutRect( containerRect,
 NMRLayoutManager::EMRLayoutMRNaviArrowLeft );
 TRect naviArrowLeftRect = naviArrowLeftLayoutRect.Rect();
 if( iScrollBar )
 {
 scrollWidth = iScrollBar->Rect().Width();
 }
-naviArrowRightRect.Move(
+naviArrowRightRect.Move( scrollWidth, 0 );
--( iToolbar.Rect().Width() + scrollWidth ), 0 );
 }
 else
 {
 // Left arrow needs to be moved right the amount of
 // stripe width in portrait
 naviArrowLeftRect.Move( iStripeRect.Width(), 0 );
-naviArrowLeftRect.Move( 0, -iToolbar.Rect().Height() );
 TRect naviArrowRightRect = naviArrowRightLayoutRect.Rect();
 naviArrowRightRect.Move( iStripeRect.Width(), 0 );
-naviArrowRightRect.Move( 0, -iToolbar.Rect().Height() );
 }
 // Get height for one row
 TAknLayoutRect rowLayout =
 NMRLayoutManager::GetLayoutRect(
 containerRect, NMRLayoutManager::EMRLayoutTextEditorIcon );
 TRect rowRect( rowLayout.Rect() );
 TRect attachmentIndicatorRect;
-/*attachmentIndicatorRect.iTl =
-TPoint( naviArrowLeftRect.iBr.iX,
-naviArrowLeftRect.iBr.iY - rowRect.Height() ); */
 attachmentIndicatorRect.iTl =
 TPoint( naviArrowLeftRect.iBr.iX,
 naviArrowLeftRect.iBr.iY - naviArrowLeftRect.Height() );
 naviArrowLeftRect.iBr.iY );
 return attachmentIndicatorRect;
 }
+// ---------------------------------------------------------------------------
+// CESMRView::ContainerRect
+// ---------------------------------------------------------------------------
+//
+TRect CESMRView::ContainerRect() const
+{
+// Remove possible intersection with toolbar from container rect
+TRect containerRect( PositionRelativeToScreen(), Rect().Size() );
+TRect toolbar( iToolbar.Rect() );
+if ( containerRect.Intersects( toolbar ) )
+{
+toolbar.Intersection( containerRect );
+if ( Layout_Meta_Data::IsLandscapeOrientation() )
+{
+containerRect.SetWidth( containerRect.Width() - toolbar.Width() );
+}
+else
+{
+containerRect.SetHeight( containerRect.Height() - toolbar.Height() );
+}
+}
+// Now toolbar does not intersect with view, so it must not be taken
+// into account when calculating other component layouts.
+containerRect.SetRect( TPoint( 0, 0 ), containerRect.Size() );
+return containerRect;
+}
 // EOF

branch	RCL_3
changeset 16	b5fbb9b25d57
parent 12	4ce476e64c59
child 18	6b8f3b30d0ec