FCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xnviewadapter.cpp

equal deleted inserted replaced

-:ff572dfe6d86
+:9674c1a575e9
 #include "xnodt.h"
 #include "xnproperty.h"
 #include "xnnodeimpl.h"
 #include "xnnode.h"
 #include "xntype.h"
-#include "xnbgcontrol.h"
 #include "xnfocuscontrol.h"
 #include "xneditor.h"
 #include "xnbackgroundmanager.h"
 #include "xnviewadapter.h"
 #include "debug.h"
 // Constants
 const TUid KXmlViewUid = { 1 };
 _LIT8( KActivateDefaultView, "activatedefault" );
+_LIT8( KMenuBar, "menubar" );
 // Data types
 enum
 {
 EIsActivated,
 CXnViewAdapter::~CXnViewAdapter()
 {
 delete iTimer;
 delete iActivate;
 delete iDeactivate;
 delete iEditState;
-delete iBgControl;
 delete iBgManager;
 delete iFocusControl;
 }
 // -----------------------------------------------------------------------------
 // Base class CAknViewAppUi takes ownership of iViewAdapter
 iAppUiAdapter.AddViewL( this );
 iAppUiAdapter.SetDefaultViewL( *this );
-iBgControl = CXnBgControl::NewL();
-iBgControl->SetMopParent( this );
 iBgManager = CXnBackgroundManager::NewL( iAppUiAdapter.ViewManager(),
 iAppUiAdapter.ViewManager().Editor().HspsWrapper() );
 iFocusControl = CXnFocusControl::NewL( iAppUiAdapter );
 {
 return iEventDispatcher;
 }
 // -----------------------------------------------------------------------------
-// CXnViewAdapter::BgControl
-// Returns bg control.
-// -----------------------------------------------------------------------------
-//
-CCoeControl& CXnViewAdapter::BgControl() const
-{
-return *iBgControl;
-}
-// -----------------------------------------------------------------------------
 // CXnViewAdapter::BgManager
 // Returns background manager.
 // -----------------------------------------------------------------------------
 //
 CXnBackgroundManager& CXnViewAdapter::BgManager() const
 {
 return *iBgManager;
 }
 // -----------------------------------------------------------------------------
-// CXnViewAdapter::BgControl
+// CXnViewAdapter::FocusControl
 // Returns focus control.
 // -----------------------------------------------------------------------------
 //
 CXnFocusControl& CXnViewAdapter::FocusControl() const
 {
 iFlags.Set( EIsActivated );
 iAppUiAdapter.AddToStackL( *this, iEventDispatcher );
+// enable statuspane transparancy
+CEikStatusPane* sp( iAppUiAdapter.StatusPane() );
 CEikButtonGroupContainer* bgc( iAppUiAdapter.Cba() );
 if ( bgc )
 {
 // EventDispatcher will handle sotkey keyevents
 CEikCba* cba(
 static_cast< CEikCba* >( bgc->ButtonGroup() ) );
 iAppUiAdapter.RemoveFromStack( cba );
 }
-iBgControl->MakeVisible( ETrue );
 iBgManager->MakeVisible( ETrue );
 // Set status pane layout
 CXnViewData& viewData( iAppUiAdapter.ViewManager().ActiveViewData() );
 CXnProperty* prop( viewData.Node()->LayoutNode()->GetPropertyL(
 // Is there status pane declaration available
 TInt spane( DetermineStatusPaneLayout( prop ) );
 if ( spane != KErrNotFound )
 {
-CEikStatusPane* sp( iAppUiAdapter.StatusPane() );
 if ( sp && sp->CurrentLayoutResId() != spane )
 {
 sp->SwitchLayoutL( spane );
 sp->ApplyCurrentSettingsL();
 }
 }
+if ( sp && !sp->IsTransparent() )
+{
+sp->EnableTransparent( ETrue );
+sp->DrawNow();
+}
 if ( iFlags.IsSet( EIsFirstActivation ) )
 {
 // Set the active container
 ActivateContainerL( iAppUiAdapter.ViewManager().ActiveViewData() );
 iAppUiAdapter.RemoveFromStack( iEventDispatcher );
 TRAP_IGNORE( DeactivateContainerL() );
-iBgControl->MakeVisible( EFalse );
 iBgManager->MakeVisible( EFalse );
 iFocusControl->MakeVisible( EFalse );
 iFlags.Clear( EIsActivated );
 // Activates container
 // -----------------------------------------------------------------------------
 //
 void CXnViewAdapter::ActivateContainerL( CXnViewData& aContainer,
 TBool aEnterEditState )
 {
-if ( iContainer == &aContainer || iFlags.IsSet( EIsDestructionRunning ) )
+if ( !iAppUiAdapter.ViewManager().UiStartupPhaseAllDone() )
+{
+return;
+}
+if ( iContainer == &aContainer || iFlags.IsSet( EIsDestructionRunning ) )
 {
 return;
 }
+const CXnViewData* previous( iContainer );
 // Deactivate previous
 DeactivateContainerL();
 if ( iFlags.IsClear( EIsActivated ) )
 {
 // Some other view than this in this appui is currently active,
 // postpone container activation
 return;
 }
 // Update
 iContainer = &aContainer;
 // Disable layout and redraw until container activation is done
 iAppUiAdapter.UiEngine().DisableRenderUiLC();
 iFlags.Clear( EIsInCall );
 // This container is in-call state
 NotifyInCallStateChaged( ETrue );
 }
+if ( aEnterEditState || iAppUiAdapter.UiEngine().IsEditMode() )
+{
+EnterEditStateL( aContainer, ETrue );
+}
+else
+{
+EnterEditStateL( aContainer, EFalse );
+}
 iAppUiAdapter.ViewManager().NotifyContainerChangedL( aContainer );
-if ( aEnterEditState || iAppUiAdapter.UiEngine().IsEditMode() )
+if ( previous && iContainer )
 {
-EnterEditStateL( aContainer, ETrue );
+iBgManager->WallpaperChanged( *previous, *iContainer );
-}
-else
-{
-EnterEditStateL( aContainer, EFalse );
 }
 CXnControlAdapter* adapter( node->Control() );
+adapter->MakeVisible( ETrue );
-iBgControl->SetCompoundControl( adapter );
 iAppUiAdapter.UiEngine().RenderUIL();
 CleanupStack::PopAndDestroy(); // DisableRenderUiLC
 }
 // -----------------------------------------------------------------------------
 // CXnViewAdapter::ActivateDefaultContainerL
 // Activates default container
 }
 CXnNode* node( iContainer->Node()->LayoutNode() );
 node->ReportXuikonEventL( *iDeactivate );
+node->Control()->MakeVisible( EFalse );
-iBgControl->SetCompoundControl( NULL );
 iContainer = NULL;
 }
 // -----------------------------------------------------------------------------
 {
 if ( !iContainer )
 {
 return;
 }
 TBool incallNow( iFlags.IsSet( EIsInCall ) ? ETrue : EFalse );
 if ( incallNow == aInCall )
 {
 return;
 }
 }
 else
 {
 iFlags.Clear( EIsInCall );
 }
-TRAP_IGNORE( UpdateRskByModeL() );
+CXnViewData& view( iAppUiAdapter.ViewManager().ActiveViewData() );
+TRAP_IGNORE( UpdateRskByUiStateL( view ) );
 }
 // -----------------------------------------------------------------------------
 // CXnViewAdapter::ChangeControlsStateL
 //
 CleanupStack::PopAndDestroy( &controls );
 }
 }
 // -----------------------------------------------------------------------------
-// CXnViewAdapter::UpdateRskByModeL()
+// CXnViewAdapter::UpdateRskByUiStateL()
 //
 // -----------------------------------------------------------------------------
 //
-void CXnViewAdapter::UpdateRskByModeL()
+void CXnViewAdapter::UpdateRskByUiStateL( const CXnViewData& aViewData )
 {
-CXnNode* menubar( iAppUiAdapter.UiEngine().MenuBarNode() );
+CXnNode* menubar( NULL );
+CXnDomNode* view( aViewData.Node() );
+if ( view && view->LayoutNode() )
+{
+RPointerArray< CXnNode >& children( view->LayoutNode()->Children() );
+for ( TInt count = children.Count() - 1; count >= 0 ; --count )
+{
+CXnNode* node( children[count] );
+// Check that the given type of a control is parent
+// (or ancestor) of this control
+const TDesC8& type( node->Type()->Type() );
+if ( type == KMenuBar )
+{
+menubar = node;
+break;
+}
+}
+}
 if( menubar )
 {
 const TDesC8* state( NULL );
 if( ( mode && *state == mode->StringValue() ) &&
 ( type && type->StringValue().Compare( XnPropertyNames::softkey::type::KRight ) == 0 ) )
 {
 menuIf->SetSoftKeyL( &node->PluginIfL() , XnMenuInterface::MXnMenuInterface::ERight );
 node->SetDirtyL( XnDirtyLevel::ERender );
+TRAP_IGNORE( iAppUiAdapter.UiEngine().RefreshMenuL() );
 }
 }
 }
 }
 }

branch	RCL_3
changeset 16	9674c1a575e9
parent 15	ff572dfe6d86
child 30	b8fae6b8a148