equal
deleted
inserted
replaced
925 { |
925 { |
926 CEikDialog* dlg = eikAppUi->TopFocusedControl()->MopGetObject( dlg ); |
926 CEikDialog* dlg = eikAppUi->TopFocusedControl()->MopGetObject( dlg ); |
927 if ( dlg ) |
927 if ( dlg ) |
928 { |
928 { |
929 CEikButtonGroupContainer* currentCba = dlg->MopGetObject( currentCba ); |
929 CEikButtonGroupContainer* currentCba = dlg->MopGetObject( currentCba ); |
930 CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
930 //CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
931 if ( currentCba && iDialogCba == currentCba ) |
931 if ( currentCba && iDialogCba == currentCba ) |
932 { |
932 { |
933 currentCba->RemoveCommandFromStack( ELeftSoftkeyIndex, -1 ); |
933 currentCba->RemoveCommandFromStack( ELeftSoftkeyIndex, -1 ); |
934 currentCba->RemoveCommandFromStack( ERightSoftkeyIndex, -1 ); |
934 currentCba->RemoveCommandFromStack( ERightSoftkeyIndex, -1 ); |
935 |
935 |
951 CEikAppUi* eikAppUi = (CEikAppUi *)CCoeEnv::Static()->AppUi(); |
951 CEikAppUi* eikAppUi = (CEikAppUi *)CCoeEnv::Static()->AppUi(); |
952 // If current is dialog create inside CBA |
952 // If current is dialog create inside CBA |
953 if ( eikAppUi!= NULL && eikAppUi->IsDisplayingDialog() && eikAppUi->TopFocusedControl()) |
953 if ( eikAppUi!= NULL && eikAppUi->IsDisplayingDialog() && eikAppUi->TopFocusedControl()) |
954 { |
954 { |
955 CEikDialog* dlg = eikAppUi->TopFocusedControl()->MopGetObject( dlg ); |
955 CEikDialog* dlg = eikAppUi->TopFocusedControl()->MopGetObject( dlg ); |
956 if ( dlg ) |
956 if ( dlg && CbaEmbeddedInDialog( dlg->DialogFlags())) |
957 { |
957 { |
958 CEikButtonGroupContainer* currentCba = dlg->MopGetObject( currentCba ); |
958 CEikButtonGroupContainer* currentCba = dlg->MopGetObject( currentCba ); |
959 CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
959 //CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
960 if ( currentCba ) |
960 if ( currentCba ) |
961 { |
961 { |
962 TUint flags( 0 ); |
962 TUint flags( 0 ); |
963 flags |= CEikButtonGroupContainer::EIsEmbedded | CEikButtonGroupContainer::EAddToStack; |
963 flags |= CEikButtonGroupContainer::EIsEmbedded | CEikButtonGroupContainer::EAddToStack; |
964 if ( iCba != NULL ) |
964 if ( iCba != NULL ) |
970 aCommandObserver, |
970 aCommandObserver, |
971 aResourceId, flags ); |
971 aResourceId, flags ); |
972 |
972 |
973 CEikCba* cba = static_cast<CEikCba*>( iCba->ButtonGroup()); |
973 CEikCba* cba = static_cast<CEikCba*>( iCba->ButtonGroup()); |
974 |
974 |
975 CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
975 //CEikCba* dlgcba = static_cast<CEikCba*>( currentCba->ButtonGroup()); |
976 if( !isCbaEmded ) |
976 if( !isCbaEmded ) |
977 { |
977 { |
978 currentCba->AddCommandToStackL( ELeftSoftkeyIndex, -1, _L(""), NULL, NULL ); |
978 currentCba->AddCommandToStackL( ELeftSoftkeyIndex, -1, _L(""), NULL, NULL ); |
979 currentCba->AddCommandToStackL( ERightSoftkeyIndex, -1, _L(""), NULL, NULL ); |
979 currentCba->AddCommandToStackL( ERightSoftkeyIndex, -1, _L(""), NULL, NULL ); |
980 currentCba->ActivateL(); |
980 currentCba->ActivateL(); |
993 } |
993 } |
994 } |
994 } |
995 } |
995 } |
996 } |
996 } |
997 |
997 |
|
998 TBool CAknFepUIAvkonImpl::CbaEmbeddedInDialog( const TInt& aFlags ) |
|
999 { |
|
1000 return AknLayoutUtils::PenEnabled() && |
|
1001 !( aFlags & EEikDialogFlagFillAppClientRect ) && |
|
1002 !( aFlags & EEikDialogFlagFillScreen ) && |
|
1003 !( aFlags & EEikDialogFlagVirtualInput ); |
|
1004 } |
998 //End of File |
1005 //End of File |