--- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP Wed Mar 31 21:59:52 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP Wed Apr 14 16:14:00 2010 +0300
@@ -2263,7 +2263,7 @@
TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
{
- fbLogicalType = ETouchFeedbackIncreasingPopUp;
+ fbLogicalType = ETouchFeedbackSubMenuOpened;
}
iExtension->ImmediateFeedback( fbLogicalType,
ETouchFeedbackVibra );
@@ -3839,7 +3839,7 @@
{
if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
{
- iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp );
+ iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed );
}
else
{
@@ -4192,7 +4192,7 @@
{
if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
{
- iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp );
+ iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed );
}
else
{
@@ -4314,7 +4314,7 @@
{
if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
{
- iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp );
+ iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed );
}
else
{
@@ -4424,7 +4424,7 @@
AknTransEffect::EComponentTransitionsOff ) )
{
iExtension->ImmediateFeedback(
- ETouchFeedbackDecreasingPopUp );
+ ETouchFeedbackSubMenuClosed );
}
else
{
@@ -5354,7 +5354,7 @@
UpdateBackgroundContext( Rect() );
PrepareHighlightFrame();
SetCascadedIconSize();
-
+ DrawDeferred();
if ( iCascadeMenuPane )
{
iCascadeMenuPane->HandleResourceChange( aType );