# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274780642 -10800
# Node ID 82ca176301de6e7a5db17aa816c252e045a50802
# Parent  2d0f9ab0ba18f11181ade5b8fce9404fe40f4ed6
Revision: 201019
Kit: 2010121

diff -r 2d0f9ab0ba18 -r 82ca176301de extras/calcsoft/src/CalcFunc.cpp
--- a/extras/calcsoft/src/CalcFunc.cpp	Tue May 11 16:14:55 2010 +0300
+++ b/extras/calcsoft/src/CalcFunc.cpp	Tue May 25 12:44:02 2010 +0300
@@ -1150,9 +1150,12 @@
         TRAP_IGNORE(button->OfferKeyEventL(aKeyEvent,aType));
 	    state->SetFlags(EnNormal);
      	}
-    button->SetFocus( EFalse, EDrawNow );      
-    button = iButtons[aNewId];        
-    button->SetFocus( ETrue, EDrawNow );
+    if( aOldId != aNewId )
+    	{
+        button->SetFocus( EFalse, EDrawNow );      
+        button = iButtons[aNewId];        
+        button->SetFocus( ETrue, EDrawNow );
+    	}
     }
 
 // ---------------------------------------------------------
diff -r 2d0f9ab0ba18 -r 82ca176301de extras/calcsoft/src/CalcOutSheet.cpp
--- a/extras/calcsoft/src/CalcOutSheet.cpp	Tue May 11 16:14:55 2010 +0300
+++ b/extras/calcsoft/src/CalcOutSheet.cpp	Tue May 25 12:44:02 2010 +0300
@@ -785,7 +785,7 @@
 			ScrollToBottomL();
 			}
 		}
-	if ( aType == KAknsMessageSkinChange || aType == KEikMessageUnfadeWindows )
+	if ( aType == KAknsMessageSkinChange )
 		{
 		if (AknLayoutUtils::PenEnabled())
 			{