# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274780710 -10800
# Node ID 9ec13d39cc2e6d7086d6040c9f0d283e4dd45719
# Parent  4e9858fa9559dcdaf6325a7b12a8b82bba32339d
Revision: 201019
Kit: 2010121

diff -r 4e9858fa9559 -r 9ec13d39cc2e vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp
--- a/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Tue May 11 16:15:55 2010 +0300
+++ b/vtengines/videoteleng/Src/Media/CVtEngMediaHandler.cpp	Tue May 25 12:45:10 2010 +0300
@@ -512,6 +512,13 @@
                     break;
                 }
             case KVtEngSetAudioRouting:
+                if ( ( iProtoState == MVtProtocolCommand::EConnected ) && 
+                     ( ( iPendingOp && iPendingOp->Command() == KVtEngHandleLayoutChange )
+                       || !iPendingOp ) )
+                    {
+                    okToPerform = KErrNone;
+                    }
+                break;
             case KVtEngSetAudioVolume:
                 if ( ( iProtoState == MVtProtocolCommand::EConnected ) && !iPendingOp )
                     {
diff -r 4e9858fa9559 -r 9ec13d39cc2e vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h
--- a/vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h	Tue May 11 16:15:55 2010 +0300
+++ b/vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h	Tue May 25 12:45:10 2010 +0300
@@ -86,6 +86,11 @@
      */
      void HandleControlEventL( CCoeControl* aControl,TCoeEvent aEventType );
      
+     /**
+     * @see CAknSettinPage::HandleResourceChange
+     */
+     void HandleResourceChange(TInt aType);
+     
 private: // new functions
         
         /*
diff -r 4e9858fa9559 -r 9ec13d39cc2e vtuis/videotelui/src/CVtUiAppUi.cpp
--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Tue May 11 16:15:55 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Tue May 25 12:45:10 2010 +0300
@@ -58,7 +58,7 @@
 #include    <StringLoader.h>
 #include    <AknDef.h>
 #include    <aknconsts.h>
-
+#include    <akntoolbar.h>
 
 #include    <e32property.h>
 #include    <ecom/ecom.h>
@@ -2490,6 +2490,10 @@
         {
         if ( layoutChange )
             {
+            if ( CurrentFixedToolbar() )
+                {
+                CurrentFixedToolbar()->HandleResourceChange( aType );
+                }
             CVtUiToolbarBase* tb = static_cast< CVtUiToolbarBase* >(
                 iFeatureManager->GetFeatureById( EVtUiFeatureIdToolbar ) );
             if( tb )
@@ -2504,15 +2508,14 @@
             {
             iInstance->iNaviPane->HandleResourceChange( aType );
             }
-        // Handle layout change only when type == DLVS
-        if ( aType == KEikDynamicLayoutVariantSwitch )
-            {
-            (void) HandleLayoutChanged();
-            }
-        }
-
+        }
     iComponentManager->HandleResourceChangeL( aType );
-
+    
+    // Handle layout change only when type == DLVS
+    if ( iInstance && aType == KEikDynamicLayoutVariantSwitch )
+        {
+        (void) DelayedHandleLayoutChanged( this );
+        }
     __VTPRINTEXIT( "VtUi.HandleResourceChangeL");
     }
 
@@ -6487,18 +6490,18 @@
     VtUiLayout::GetApplicationParentRect( parent );
     VtUiLayout::GetMainPaneLayout( control );
     AknLayoutUtils::LayoutControl( iMainControl, parent, control );
+    iMainControl->DrawNow();
     if(iMainControl)
         iMainControl->LayoutRemoteVideo();
     AknLayoutUtils::LayoutControl( iNumberEntryActivation, parent, control );
     VtUiLayout::GetFirstWindowBackgroundLayout( control );
     AknLayoutUtils::LayoutControl( iContextControl, parent, control );
-    
+    iContextControl->DrawNow();
+    if(iContextControl)
+        iContextControl->LayoutRemoteVideo();
     VtUiLayout::GetButtonPaneLayout( control );
     AknLayoutUtils::LayoutControl( iEndCallButtonPane, parent, control );
-    
-    if(iContextControl)
-        iContextControl->LayoutRemoteVideo();
-    
+    iEndCallButtonPane->DrawNow();
     }
 
 // -----------------------------------------------------------------------------
diff -r 4e9858fa9559 -r 9ec13d39cc2e vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp
--- a/vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp	Tue May 11 16:15:55 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiEndCallButtonPane.cpp	Tue May 25 12:45:10 2010 +0300
@@ -81,6 +81,10 @@
         Window().SetNonFading( ETrue );
         }
     
+    // For set non focus and recieve all point event
+    SetNonFocusing();
+    ClaimPointerGrab( ETrue );
+
     __VTPRINTEXIT( "CVtUiEndCallButtonPane.ConstructL" )
     }
 
diff -r 4e9858fa9559 -r 9ec13d39cc2e vtuis/videotelui/src/CVtUiMainControl.cpp
--- a/vtuis/videotelui/src/CVtUiMainControl.cpp	Tue May 11 16:15:55 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiMainControl.cpp	Tue May 25 12:45:10 2010 +0300
@@ -83,6 +83,11 @@
             EVtUiBitmap_qgn_indi_call_video_blind_in_mask_icon,
             EFalse );
     BitmapManager().SetAspectRatio( iBlindMaskId, EFalse );
+    
+    // For set non focus and recieve all point event
+    SetNonFocusing();
+    ClaimPointerGrab( ETrue );
+    
     __VTPRINTEXIT( "MainCtrl.ConstructL" )
     }
 
diff -r 4e9858fa9559 -r 9ec13d39cc2e vtuis/videotelui/src/features/prefs/cvtuitransparentsettingpage.cpp
--- a/vtuis/videotelui/src/features/prefs/cvtuitransparentsettingpage.cpp	Tue May 11 16:15:55 2010 +0300
+++ b/vtuis/videotelui/src/features/prefs/cvtuitransparentsettingpage.cpp	Tue May 25 12:45:10 2010 +0300
@@ -35,9 +35,9 @@
 *  @since S60 v3.2
 */
 void CVtUiTransparentSettingPage::HandleLayoutChangeL()
-{
-	  	GetTheLayoutData();
-}
+    {
+    GetTheLayoutData();
+    }
 
 // -----------------------------------------------------------------------------
 // CVtUiTransparentSettingPage::CVtUiTransparentSettingPage
@@ -157,6 +157,16 @@
     }
 
 // -----------------------------------------------------------------------------
+// CVtUiTransparentSettingPage::HandleResourceChange
+// -----------------------------------------------------------------------------
+//
+void CVtUiTransparentSettingPage::HandleResourceChange(TInt aType)
+    {
+    CAknTransparentCameraSettingPage::HandleResourceChange(aType);
+    GetTheLayoutData();
+    }
+
+// -----------------------------------------------------------------------------
 // CVtUiTransparentSettingPage::RectFromLayout
 // -----------------------------------------------------------------------------
 //