uifw/EikStd/coctlsrc/EIKCOLIB.CPP
branchRCL_3
changeset 55 aecbbf00d063
parent 10 9f56a4e1b8ab
child 56 d48ab3b357f1
--- a/uifw/EikStd/coctlsrc/EIKCOLIB.CPP	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKCOLIB.CPP	Tue Aug 31 15:28:30 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-1999 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -523,9 +523,15 @@
     CCoeEnv* env = CCoeEnv::Static();
     TRect rect = LafAppUi::ClientRect( *env, *this );
 
+#ifdef RD_SCALABLE_UI_V2
+    if ( TouchPane() )
+        {
+        TouchPane()->ReduceRect( rect );
+        }
+
     CAknToolbar* toolbar = CurrentFixedToolbar();
 
-    // Reduce fixed toolbar's area.
+    // reduce fixed toolbar's area
     if ( toolbar )
         {
         TInt flags = toolbar->ToolbarFlags();
@@ -536,37 +542,35 @@
             }
         }
 
-    // Recalculate the client rect is split input is enabled.
+	  // recaculate the client rect is splitinput is enabled.
     if ( iExtension && iExtension->iSplitInput )
         {
         TInt inputTop = rect.iBr.iY;
         TAknLayoutRect splitwnd;
-        TRect screenRect ;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
+		TRect screenRect ;
+		AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
 
         if ( Layout_Meta_Data::IsLandscapeOrientation() )
             {
-            splitwnd.LayoutRect(
-                screenRect,
-                AknLayoutScalable_Avkon::popup_fep_vkbss_window( 0 ).LayoutLine() );
+            splitwnd.LayoutRect( screenRect, AknLayoutScalable_Avkon::popup_fep_vkbss_window (0).LayoutLine() );
+            TRect wndRc = splitwnd.Rect();
+            inputTop = wndRc.iTl.iY;
             }
         else
             {
-            splitwnd.LayoutRect(
-                screenRect,
-                AknLayoutScalable_Avkon::popup_fep_ituss_window( 0 ).LayoutLine() );
+            splitwnd.LayoutRect( screenRect, AknLayoutScalable_Avkon::popup_fep_ituss_window(0).LayoutLine() );
+            TRect wndRc = splitwnd.Rect();
+            inputTop = wndRc.iTl.iY;
             }
-        
-        TRect wndRc( splitwnd.Rect() );
-        inputTop = wndRc.iTl.iY;
         rect.iBr.iY = rect.iBr.iY > inputTop ? inputTop : rect.iBr.iY;
         rect.iTl.iY = 0;
         }
 
+#endif // RD_SCALABLE_UI_V2	
+
     return rect;
     }
 
-
 void CEikAppUiFactory::ReadAppInfoResourceL(TInt aResourceFileOffset, CEikAppUi* aAppUi)
     {
     const TInt resourceFileOffset=(aResourceFileOffset)? aResourceFileOffset : aAppUi->Application()->ResourceFileOffset();