equal
deleted
inserted
replaced
151 if ( !iItemActionMenu ) |
151 if ( !iItemActionMenu ) |
152 { |
152 { |
153 AknItemActionMenuRegister::RegisterMenuBarL( *iBar ); |
153 AknItemActionMenuRegister::RegisterMenuBarL( *iBar ); |
154 } |
154 } |
155 // hide item-specific commands if highlight not visible |
155 // hide item-specific commands if highlight not visible |
156 if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext |
156 if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext |
157 && iItemActionMenu |
157 && ( ( iItemActionMenu |
158 && !iItemActionMenu->CollectionHighlightVisible() ) |
158 && !iItemActionMenu->CollectionHighlightVisible() ) |
159 { |
159 || !iItemActionMenu ) ) |
|
160 { |
160 iBar->iMenuPane->SetItemCommandsDimmed(); |
161 iBar->iMenuPane->SetItemCommandsDimmed(); |
161 } |
162 } |
162 } |
163 } |
163 |
164 |
164 |
165 |
1002 if ( feedback ) |
1003 if ( feedback ) |
1003 { |
1004 { |
1004 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
1005 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
1005 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
1006 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
1006 { |
1007 { |
1007 fbLogicalType = ETouchFeedbackIncreasingPopUp; |
1008 fbLogicalType = ETouchFeedbackOptionsMenuOpened; |
1008 } |
1009 } |
1009 feedback->InstantFeedback( |
1010 feedback->InstantFeedback( |
1010 this, |
1011 this, |
1011 fbLogicalType, |
1012 fbLogicalType, |
1012 ETouchFeedbackVibra, |
1013 ETouchFeedbackVibra, |
1192 if ( feedback ) |
1193 if ( feedback ) |
1193 { |
1194 { |
1194 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
1195 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
1195 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
1196 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
1196 { |
1197 { |
1197 fbLogicalType = ETouchFeedbackDecreasingPopUp; |
1198 fbLogicalType = ETouchFeedbackOptionsMenuClosed; |
1198 } |
1199 } |
1199 feedback->InstantFeedback( |
1200 feedback->InstantFeedback( |
1200 this, |
1201 this, |
1201 fbLogicalType, |
1202 fbLogicalType, |
1202 ETouchFeedbackVibra, |
1203 ETouchFeedbackVibra, |