equal
deleted
inserted
replaced
2261 } |
2261 } |
2262 |
2262 |
2263 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
2263 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; |
2264 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
2264 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
2265 { |
2265 { |
2266 fbLogicalType = ETouchFeedbackIncreasingPopUp; |
2266 fbLogicalType = ETouchFeedbackSubMenuOpened; |
2267 } |
2267 } |
2268 iExtension->ImmediateFeedback( fbLogicalType, |
2268 iExtension->ImmediateFeedback( fbLogicalType, |
2269 ETouchFeedbackVibra ); |
2269 ETouchFeedbackVibra ); |
2270 _AKNTRACE_FUNC_EXIT; |
2270 _AKNTRACE_FUNC_EXIT; |
2271 } |
2271 } |
3837 { |
3837 { |
3838 if ( aPointerEvent.iType == TPointerEvent::EButton1Down ) |
3838 if ( aPointerEvent.iType == TPointerEvent::EButton1Down ) |
3839 { |
3839 { |
3840 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
3840 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
3841 { |
3841 { |
3842 iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp ); |
3842 iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); |
3843 } |
3843 } |
3844 else |
3844 else |
3845 { |
3845 { |
3846 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
3846 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
3847 } |
3847 } |
4190 // if submenu, and clicked outside of it |
4190 // if submenu, and clicked outside of it |
4191 if ( !cascadeMenuRect.Contains( aPointerEvent.iPosition ) ) |
4191 if ( !cascadeMenuRect.Contains( aPointerEvent.iPosition ) ) |
4192 { |
4192 { |
4193 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
4193 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
4194 { |
4194 { |
4195 iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp ); |
4195 iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); |
4196 } |
4196 } |
4197 else |
4197 else |
4198 { |
4198 { |
4199 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
4199 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
4200 } |
4200 } |
4312 // clicked outside, then close menu case by case |
4312 // clicked outside, then close menu case by case |
4313 if ( iCascadeMenuPane ) |
4313 if ( iCascadeMenuPane ) |
4314 { |
4314 { |
4315 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
4315 if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) |
4316 { |
4316 { |
4317 iExtension->ImmediateFeedback( ETouchFeedbackDecreasingPopUp ); |
4317 iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); |
4318 } |
4318 } |
4319 else |
4319 else |
4320 { |
4320 { |
4321 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
4321 iExtension->ImmediateFeedback( ETouchFeedbackPopUp ); |
4322 } |
4322 } |
4422 { |
4422 { |
4423 if ( CAknTransitionUtils::TransitionsEnabled( |
4423 if ( CAknTransitionUtils::TransitionsEnabled( |
4424 AknTransEffect::EComponentTransitionsOff ) ) |
4424 AknTransEffect::EComponentTransitionsOff ) ) |
4425 { |
4425 { |
4426 iExtension->ImmediateFeedback( |
4426 iExtension->ImmediateFeedback( |
4427 ETouchFeedbackDecreasingPopUp ); |
4427 ETouchFeedbackSubMenuClosed ); |
4428 } |
4428 } |
4429 else |
4429 else |
4430 { |
4430 { |
4431 iExtension->ImmediateFeedback( |
4431 iExtension->ImmediateFeedback( |
4432 ETouchFeedbackPopUp ); |
4432 ETouchFeedbackPopUp ); |
5352 TRAP_IGNORE( DoUpdateScrollBarL() ); |
5352 TRAP_IGNORE( DoUpdateScrollBarL() ); |
5353 |
5353 |
5354 UpdateBackgroundContext( Rect() ); |
5354 UpdateBackgroundContext( Rect() ); |
5355 PrepareHighlightFrame(); |
5355 PrepareHighlightFrame(); |
5356 SetCascadedIconSize(); |
5356 SetCascadedIconSize(); |
5357 |
5357 DrawDeferred(); |
5358 if ( iCascadeMenuPane ) |
5358 if ( iCascadeMenuPane ) |
5359 { |
5359 { |
5360 iCascadeMenuPane->HandleResourceChange( aType ); |
5360 iCascadeMenuPane->HandleResourceChange( aType ); |
5361 } |
5361 } |
5362 |
5362 |