574 // ----------------------------------------------------------------------------- |
574 // ----------------------------------------------------------------------------- |
575 // |
575 // |
576 EXPORT_C void CAknView::AknViewActivatedL( const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage ) |
576 EXPORT_C void CAknView::AknViewActivatedL( const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage ) |
577 { |
577 { |
578 ConstructMenuAndCbaL( ETrue ); |
578 ConstructMenuAndCbaL( ETrue ); |
579 |
579 if ( !Extension()->iViewActivated ) |
580 if ( !iViewInfo.iMenu ) |
|
581 { |
|
582 AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( this ); |
|
583 } |
|
584 |
|
585 Extension()->PrepareToolbar(); |
|
586 |
|
587 DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage ); |
|
588 |
|
589 if ( !Extension()->iViewActivated || !iViewInfo.iMenu ) |
|
590 { |
580 { |
591 // Reset menu bar owner when view first activated |
581 // Reset menu bar owner when view first activated |
592 AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( NULL ); |
582 AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( NULL ); |
593 Extension()->iViewActivated = ETrue; |
583 Extension()->iViewActivated = ETrue; |
594 } |
584 } |
|
585 |
|
586 Extension()->PrepareToolbar(); |
|
587 |
|
588 DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage ); |
595 |
589 |
596 #ifdef RD_SCALABLE_UI_V2 |
590 #ifdef RD_SCALABLE_UI_V2 |
597 if ( iAvkonAppUi->TouchPane() ) |
591 if ( iAvkonAppUi->TouchPane() ) |
598 { |
592 { |
599 iAvkonAppUi->TouchPane()->RefreshL(); |
593 iAvkonAppUi->TouchPane()->RefreshL(); |