textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutrootctrl.cpp
branchRCL_3
changeset 21 ecbabf52600f
parent 20 ebd48d2de13c
--- a/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutrootctrl.cpp	Tue Aug 31 15:31:50 2010 +0300
+++ b/textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutrootctrl.cpp	Wed Sep 01 12:23:33 2010 +0100
@@ -815,7 +815,13 @@
 
 	if(!AbleToDraw())
         return;
-	
+    
+    if(UiLayout()->NotDrawToLayoutDevice())
+	    {
+	    HandleResourceChange(KPenInputOwnDeviceResourceChange);
+	    }
+	    
+	Clear();	
     CControlGroup::Draw();
 
     if(!iShadowRect.IsEmpty())        
@@ -865,7 +871,7 @@
 
     if ( AknsUtils::AvkonSkinEnabled() )
         {
-        AknsUtils::GetCachedColor( AknsUtils::SkinInstance(),
+        AknsUtils::GetCachedColor( UiLayout()->SkinInstance(),
                                penCor, KAknsIIDQsnTextColors, clrIndex );
         }
 
@@ -1004,7 +1010,9 @@
         {
         if(aCtrl->OrderPos() <= iPopCtrlList[i]->OrderPos())
             {
+            CFepUiBaseCtrl* temp = iPopCtrlList[i - 1];
             iPopCtrlList[i - 1] = iPopCtrlList[i];
+            iPopCtrlList[i] = temp;
             }
         else
             {
@@ -1142,7 +1150,10 @@
             {
             if(aCtrl->OrderPos() >= iPopCtrlList[i]->OrderPos())
                 {
-                iPopCtrlList[i+1] = iPopCtrlList[i];
+                CFepUiBaseCtrl* temp = iPopCtrlList[i + 1];
+                iPopCtrlList[i + 1] = iPopCtrlList[i];
+                iPopCtrlList[i] = temp;   
+
                 }
             else
                 {