# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272375246 -10800
# Node ID 71306c87785a57baa45463e5ab5faa964ca673d8
# Parent  4c163c82e7adde73adce3d3cd52496e8b657b7ff
Revision: 201015
Kit: 201017

diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/inc/musuieventcontroller.h
--- a/mmsharing/mmshui/inc/musuieventcontroller.h	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/inc/musuieventcontroller.h	Tue Apr 27 16:34:06 2010 +0300
@@ -208,7 +208,7 @@
     /**
     * Starts shutdown process
     */
-    void HandleExitL();
+    void HandleExitL( TBool aTerminateCall = EFalse );
 
     /**
     * 
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/inc/musuigeneralview.h
--- a/mmsharing/mmshui/inc/musuigeneralview.h	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/inc/musuigeneralview.h	Tue Apr 27 16:34:06 2010 +0300
@@ -240,6 +240,7 @@
     void DoBackgroundEventL( TBool aExit );
     void SetCurrentFgBgEvent( TMusFgBgEventType aEventType );
     TInt ToolbarPlaceHolderHeight() const;
+    TInt ToolbarPlaceHolderWidth() const;
     void UpdateBackgroundOrdinalPosition( TBool aUp );  
 
 protected: // data
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/inc/musuisendview.h
--- a/mmsharing/mmshui/inc/musuisendview.h	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/inc/musuisendview.h	Tue Apr 27 16:34:06 2010 +0300
@@ -95,7 +95,6 @@
 
 protected: // data
     
-    CAknAppUiBase::TAppUiOrientation iSavedOrientation;
     TBool iPauseSelected;
     
     };
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/src/musuiappui.cpp
--- a/mmsharing/mmshui/src/musuiappui.cpp	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/src/musuiappui.cpp	Tue Apr 27 16:34:06 2010 +0300
@@ -672,9 +672,8 @@
         iCoeEnv->RootWin().EnableFocusChangeEvents();
         handleEvent = ETrue;
         }
-    else if ( ( windowGroupId != iThisApplicationWgId ) &&
+    else if ( ( windowGroupId != iThisApplicationWgId ) && 
               ( windowGroupId != iEikonServerWgId ) &&
-              ( windowGroupId != iAknCapServerWgId ) &&
               ( windowGroupId != iAknNfyServerWgId ) )
         {
         iCoeEnv->RootWin().DisableFocusChangeEvents();
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/src/musuieventcontroller.cpp
--- a/mmsharing/mmshui/src/musuieventcontroller.cpp	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/src/musuieventcontroller.cpp	Tue Apr 27 16:34:06 2010 +0300
@@ -520,7 +520,7 @@
 //
 // -----------------------------------------------------------------------------
 //
-void CMusUiEventController::HandleExitL()
+void CMusUiEventController::HandleExitL( TBool aTerminateCall )
     {
     MUS_LOG( "mus: [MUSUI ]  -> CMusUiEventController::HandleExitL" );
     
@@ -557,6 +557,11 @@
         // Sharing Ended note
         MusUiDialogUtil::ShowGlobalInformationDialogL( 
                                 R_MUS_LIVE_SHARING_VIEW_NOTE_SHARING_ENDED );
+        
+        if( aTerminateCall )
+			{
+			iEventObserver.TerminateCall();
+			}
 
         // TODO: Continue Recording query, if sharing live video and receiving end
         //    terminates the sharing session
@@ -953,8 +958,7 @@
             {
             MUS_LOG( "mus: [MUSUI ]     CMusUiReceiveController::ConstructL:\
                                     EMusuiCmdViewEndActiveCall" );
-            iEventObserver.TerminateCall();
-            HandleExitL();
+            HandleExitL( ETrue );
             break;
             }
         case EMusuiGenCmdExit:
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/src/musuigeneralview.cpp
--- a/mmsharing/mmshui/src/musuigeneralview.cpp	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/src/musuigeneralview.cpp	Tue Apr 27 16:34:06 2010 +0300
@@ -865,6 +865,25 @@
     }
 
 // -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+TInt CMusUiGeneralView::ToolbarPlaceHolderWidth() const 
+    { 
+    TInt toolbarPlaceHolderWidth( 0 ); 
+    CAknAppUiBase::TAppUiOrientation orientation = MusAppUi()->AppOrientation(); 
+    if ( !Toolbar()->IsShown() && 
+         orientation == CAknAppUiBase::EAppUiOrientationLandscape &&                        
+         AknLayoutUtils::PenEnabled() ) 
+        { 
+        // In touch UI in EAppUiOrientationLandscape mode the toolbar 
+        // fills the whole lower part of the screen 
+        toolbarPlaceHolderWidth = Toolbar()->Size().iWidth; 
+        } 
+    return toolbarPlaceHolderWidth;       
+    } 
+
+// -----------------------------------------------------------------------------
 // Increase/Decrease background container ordinal so that other controls
 // can preceed background
 // -----------------------------------------------------------------------------
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/src/musuilivesharingview.cpp
--- a/mmsharing/mmshui/src/musuilivesharingview.cpp	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/src/musuilivesharingview.cpp	Tue Apr 27 16:34:06 2010 +0300
@@ -638,11 +638,15 @@
     CMusUiSendView::DoActivateL( aPrevViewId, 
                                  aCustomMessageId,
                                  aCustomMessage );
+    
+    TRect clientRect = ClientRect(); 
+    clientRect.iBr.iX -= ToolbarPlaceHolderWidth(); 
+    clientRect.iBr.iY -= ToolbarPlaceHolderHeight(); 
 
-    TRect containerRect( ClientRect().iBr.iX - KMusUiContainerWidth, 
-                         ClientRect().iTl.iY, 
-                         ClientRect().iBr.iX,
-                         ClientRect().iBr.iY - ToolbarPlaceHolderHeight() );
+    TRect containerRect( clientRect.iBr.iX - KMusUiContainerWidth, 
+    		             clientRect.iTl.iY, 
+    		             clientRect.iBr.iX,
+    		             clientRect.iBr.iY );
 
     if ( !iContainer )
         {
diff -r 4c163c82e7ad -r 71306c87785a mmsharing/mmshui/src/musuisendview.cpp
--- a/mmsharing/mmshui/src/musuisendview.cpp	Wed Apr 14 15:53:49 2010 +0300
+++ b/mmsharing/mmshui/src/musuisendview.cpp	Tue Apr 27 16:34:06 2010 +0300
@@ -37,7 +37,6 @@
     {
     MUS_LOG( "mus: [MUSUI ]  -> CMusUiSendView::ConstructL" );
     CMusUiGeneralView::ConstructL();
-    iSavedOrientation = MusAppUi()->AppOrientation();
     MUS_LOG( "mus: [MUSUI ]  <- CMusUiSendView::ConstructL" );
     }
 
@@ -62,16 +61,12 @@
     MUS_LOG_TDESC( "mus: [MUSUI ]    -> CMusUiSendView::ManualAddressEntryL: ",
                             aAddress );
      
-    CAknAppUiBase::TAppUiOrientation aOrientation 
-					= CAknAppUiBase::EAppUiOrientationUnspecified;
     
      TBuf<KMusSipAddressMaxLength> address( aAddress );
     if ( SendController() && MusUiDialogUtil::ShowTextQueryDialogL( 
                                     R_MUS_TEXT_ENTER_ADDRESS_DIALOG_PROMPT, 
                                     address ) )
-        {
-        //to get the AppOrientation before sending invatation
-        aOrientation = MusAppUi()->AppOrientation();       
+        {      
         SendController()->InviteL( address );
         }
     else
@@ -81,10 +76,6 @@
         MusAppUi()->HandleExit();
         }
 
-    if( aOrientation != iSavedOrientation)
-    	{
-         SendController()->ChangeOrientationL( iSavedOrientation );
-    	}
     MUS_LOG( "mus: [MUSUI ]  <- CMusUiSendView::ManualAddressEntryL" );
     }