uifw/EikStd/coctlsrc/EIKMENUB.CPP
branchRCL_3
changeset 16 71dd06cfe933
parent 4 8ca85d2f0db7
child 23 3d340a0166ff
--- a/uifw/EikStd/coctlsrc/EIKMENUB.CPP	Wed Mar 31 21:59:52 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKMENUB.CPP	Wed Apr 14 16:14:00 2010 +0300
@@ -153,10 +153,11 @@
         AknItemActionMenuRegister::RegisterMenuBarL( *iBar );
         }
     // hide item-specific commands if highlight not visible 
-    if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext
-            && iItemActionMenu
-            && !iItemActionMenu->CollectionHighlightVisible() )
-        {
+    if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext 
+            && ( ( iItemActionMenu 
+            && !iItemActionMenu->CollectionHighlightVisible() ) 
+            || !iItemActionMenu ) ) 
+        {  
         iBar->iMenuPane->SetItemCommandsDimmed();
         }
     }
@@ -1004,7 +1005,7 @@
             TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
             if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
                 {
-                fbLogicalType = ETouchFeedbackIncreasingPopUp;
+                fbLogicalType = ETouchFeedbackOptionsMenuOpened;
                 }
             feedback->InstantFeedback(
                                    this,
@@ -1194,7 +1195,7 @@
                     TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
                     if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
                         {
-                        fbLogicalType = ETouchFeedbackDecreasingPopUp;
+                        fbLogicalType = ETouchFeedbackOptionsMenuClosed;
                         }
                     feedback->InstantFeedback(
                                            this,