uifw/EikStd/coctlsrc/EIKMENUP.CPP
branchRCL_3
changeset 13 a8834a2e9a96
parent 12 941195f2d488
child 15 c52421ed5f07
--- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP	Tue May 25 12:58:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP	Wed Jun 09 09:58:37 2010 +0300
@@ -841,11 +841,6 @@
         {
         cascadeMenuPane->SetParent( iControl );
         GfxTransEffect::Begin( cascadeMenuPane, KGfxControlAppearAction );
-        if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-            {
-            ImmediateFeedback( ETouchFeedbackSubMenuOpened,
-                                            ETouchFeedbackVibra );
-            }
         cascadeMenuPane->StartDisplayingMenuPane( iControl->iHotKeyTable,
                                                   iControl->Position(),
                                                   NULL,
@@ -1256,6 +1251,7 @@
     iFlags.Clear( EContextSensitive );
     iFlags.Clear( EHighlightEnabled );
     iFlags.Clear( EHideViewSpecificCommands );
+    iFlags.Clear( EHideMarkAndUnmark ); 
     _AKNTRACE_FUNC_EXIT;
     }
 
@@ -2287,7 +2283,13 @@
         {
         iExtension->StartCascadeMenuAppearTransition();
         }
-    iExtension->ImmediateFeedback( ETouchFeedbackPopUp,
+
+    TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
+    if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
+        {
+        fbLogicalType = ETouchFeedbackSubMenuOpened;
+        }
+    iExtension->ImmediateFeedback( fbLogicalType,
                                        ETouchFeedbackVibra );
     _AKNTRACE_FUNC_EXIT;
     }