MCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xnuiengineimpl.cpp

equal deleted inserted replaced

-:f966699dea19
+:ff572dfe6d86
 // System includes
 #include <utf.h>
 #include <eikapp.h>
 #include <AknUtils.h>
 #include <layoutmetadata.cdl.h>
-#include <aknpriv.hrh>
+#include <AknPriv.hrh>
 // User includes
 #include "xnuiengine.h"
 #include "xnuiengineimpl.h"
 #include "xnuistatelistener.h"
 #include "xnpanic.h"
 #include "xneffectmanager.h"
 #include "xneditor.h"
 #include "xnbackgroundmanager.h"
 #include "xntexteditor.h"
+#include "xnbgcontrol.h"
 #ifdef _XN_PERFORMANCE_TEST_
 #include "xntimemon.h"
 #endif
 TReal& aVerticalUnitInPixels, TRect aRect );
 static CXnNode* BuildScreenDeviceChangeTriggerNodeLC(
 CXnUiEngine& aUiEngine );
 static void FillFocusCandidatesL( CXnNode* aParent,
 RPointerArray< CXnNode >& aArray );
-static TInt DetermineStatusPaneLayout( CXnProperty* aProperty );
 static TBool SetAdaptivesL( CXnNode& aNode );
 static void FindNodeByClassL( CXnNode* aRootNode, const TDesC8& aClassId,
 CXnPointerArray& aArray, const TDesC8& aNamespace );
 static CXnNode* FindNodeByIdL( CXnNode* aRootNode, const TDesC8& aAreaId,
 const TDesC8* reasonString( NULL );
 if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 reasonString = &XnPropertyNames::action::trigger::name::
-uidefinitionmodification::reason::KLandscape;
+orientation::reason::KLandscape;
 }
 else
 {
 reasonString = &XnPropertyNames::action::trigger::name::
-uidefinitionmodification::reason::KPortrait;
+orientation::reason::KPortrait;
 }
 reasonValue->SetStringValueL( CXnDomPropertyValue::EString, *reasonString );
 CXnProperty* reason = CXnProperty::NewL( XnPropertyNames::action::trigger::
-name::uidefinitionmodification::KReason, reasonValue, *sp );
+name::orientation::KReason, reasonValue, *sp );
 CleanupStack::Pop( reasonValue );
 CleanupStack::PushL( reason );
 for ( TInt i = 0; i < children.Count(); i++ )
 {
 FillFocusCandidatesL( children[i], aArray );
 }
-}
-// -----------------------------------------------------------------------------
-// DetermineStatusPaneLayout
-// -----------------------------------------------------------------------------
-//
-static TInt DetermineStatusPaneLayout( CXnProperty* aProperty )
-{
-TInt spane( KErrNotFound );
-if ( aProperty )
-{
-const TDesC8& value( aProperty->StringValue() );
-// Currently supported status pane layout
-if ( value == XnPropertyNames::view::statuspanelayout::KNone )
-{
-spane = R_AVKON_STATUS_PANE_LAYOUT_EMPTY;
-}
-if ( value == XnPropertyNames::view::statuspanelayout::KBasic )
-{
-spane = R_AVKON_STATUS_PANE_LAYOUT_IDLE;
-}
-else if ( value == XnPropertyNames::view::statuspanelayout::KBasicFlat )
-{
-spane = R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT;
-}
-else if ( value ==
-XnPropertyNames::view::statuspanelayout::KWideScreen )
-{
-spane = R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE;
-}
-else if ( value ==
-XnPropertyNames::view::statuspanelayout::KWideScreenFlat )
-{
-spane = R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT;
-}
-else if ( value ==
-XnPropertyNames::view::statuspanelayout::
-KWideScreenFlat3Softkeys )
-{
-spane = R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS;
-}
-}
-return spane;
 }
 // -----------------------------------------------------------------------------
 // SetAdaptivesL
 // -----------------------------------------------------------------------------
 // CXnUiEngineImpl::SetFocusedNodeL()
 // -----------------------------------------------------------------------------
 //
 void CXnUiEngineImpl::SetFocusedNodeL( CXnNode* aFocusedNode, TInt aSource )
 {
-iKeyEventDispatcher->SetNodeL( aFocusedNode, aSource );
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->SetNodeL( aFocusedNode, aSource );
+}
 }
 // -----------------------------------------------------------------------------
 // CXnUiEngine::FocusedNode
 // Forwards the call to the ui engine implementation
 // -----------------------------------------------------------------------------
 //
 CXnNode* CXnUiEngineImpl::FocusedNode()
 {
-return iKeyEventDispatcher->FocusedNode();
+if ( iKeyEventDispatcher )
+{
+return iKeyEventDispatcher->FocusedNode();
+}
+return NULL;
 }
 // -----------------------------------------------------------------------------
 // CXnUiEngineImpl::IsEditMode
 // Returns ETrue if the current mode is edit, otherwise EFalse.
 iCurrentViewControlAdapter = iCurrentView->Control();
 iDirtyList.Reset();
 iRedrawRegions.ResetAndDestroy();
-// Set status pane layout
-CXnProperty* prop( iCurrentView->GetPropertyL(
-XnPropertyNames::view::KStatusPaneLayout ) );
-// 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();
-}
-}
 // Remove previous menubar and stylus popup node
 iMenuNode = NULL;
 iStylusPopupNode = NULL;
-iKeyEventDispatcher->ResetMenuNodeL();
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->ResetMenuNodeL();
+}
 RPointerArray< CXnNode >& children( iCurrentView->Children() );
 for ( TInt count = children.Count() - 1; count >= 0 ; --count )
 {
 CXnNode* node( children[count] );
 }
 }
 // Set menu node even if its NULL, to allow keyevent dispatcher
 // to handle no softkeys
-iKeyEventDispatcher->SetMenuNodeL( iMenuNode );
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->SetMenuNodeL( iMenuNode );
+}
 ReportScreenDeviceChangeL();
 SetClientRectL( iAppUiAdapter.ClientRect(), EFalse );
 RootNode()->SetDirtyL();
 {
 if ( *itemType == KAddWidget )
 {
 if ( aPlugin && &aPlugin->Node() )
 {
-CXnPluginData& data( viewData.Plugin( &aPlugin->Node() ) );
+CXnPluginData* data( viewData.Plugin( &aPlugin->Node() ) );
-if ( !data.Occupied() )
+if ( data && !data->Occupied() )
 {
 retval = ETrue;
 }
 }
 }
 {
 CXnNode* node( ( aPlugin ) ? &aPlugin->Node() : FocusedNode() );
 if ( node )
 {
-CXnPluginData& data( viewData.Plugin( node ) );
+CXnPluginData* data( viewData.Plugin( node ) );
-if ( data.Removable() && data.Occupied() )
+if ( data && data->Removable() && data->Occupied() )
 {
 retval = ETrue;
 }
 }
 }
 //
 void CXnUiEngineImpl::RefreshMenuL()
 {
 if ( iLayoutControl & XnLayoutControl::ERefreshMenu )
 {
-iKeyEventDispatcher->RefreshMenuL();
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->RefreshMenuL();
+}
 iLayoutControl &= ~XnLayoutControl::ERefreshMenu;
 }
 }
 // -----------------------------------------------------------------------------
 if(!iSplitScreenState.isPartialScreenEnabled )
 {
 DisableRenderUiLC();
 HandlePartialTouchInputL( aType );
 RootNode()->SetDirtyL();
+ForceRenderUIL();
 CleanupStack::PopAndDestroy();
 }
 }
 if ( aType == KAknSplitInputDisabled )
 if( iSplitScreenState.isPartialScreenEnabled )
 {
 DisableRenderUiLC();
 HandlePartialTouchInputL( aType );
 RootNode()->SetDirtyL();
-CleanupStack::PopAndDestroy();
+ForceRenderUIL();
+CleanupStack::PopAndDestroy();
 }
 }
 if ( iMenuNode )
 {
 // Checks whether the menu is displaying or not.
 // -----------------------------------------------------------------------------
 //
 TBool CXnUiEngineImpl::IsMenuDisplaying()
 {
-return iKeyEventDispatcher->IsMenuFocused();
+if ( iKeyEventDispatcher )
+{
+return iKeyEventDispatcher->IsMenuFocused();
+}
+return EFalse;
 }
 // -----------------------------------------------------------------------------
 // CXnUiEngineImpl::MenubarNode
 // Returns menubar node
 // CXnUiEngineImpl::AddPassiveFocusedNode
 // -----------------------------------------------------------------------------
 //
 void CXnUiEngineImpl::AddPassiveFocusedNodeL( CXnNode* aNode )
 {
-iKeyEventDispatcher->AddPassiveFocusedNodeL( aNode );
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->AddPassiveFocusedNodeL( aNode );
+}
 }
 // -----------------------------------------------------------------------------
 // CXnUiEngineImpl::RemovePassiveFocusedNode
 // -----------------------------------------------------------------------------
 //
 void CXnUiEngineImpl::RemovePassiveFocusedNodeL( CXnNode* aNode )
 {
-iKeyEventDispatcher->RemovePassiveFocusedNodeL( aNode );
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->RemovePassiveFocusedNodeL( aNode );
+}
 }
 // -----------------------------------------------------------------------------
 // CXnUiEngineImpl::AddPassiveFocusedNode
 // -----------------------------------------------------------------------------
 //
 void CXnUiEngineImpl::ClearPassiveFocusedNodesL()
 {
-iKeyEventDispatcher->ClearPassiveFocusedNodesL();
+if ( iKeyEventDispatcher )
+{
+iKeyEventDispatcher->ClearPassiveFocusedNodesL();
+}
 }
 // -----------------------------------------------------------------------------
 // SetNodeDroppedL()
 // Sets node's dropped state
 if( !iSplitScreenState.iPartialScreenEditorNode )
 {
 return;
 }
 if ( aType == KAknSplitInputEnabled )
 {
+// make sure that we always get up event
+CCoeControl& bg( iAppUiAdapter.ViewAdapter().BgControl() );
+static_cast<CXnBgControl*>(&bg)->ResetGrabbingL();
 // don't remove input from stack if split input is enabled
 XnTextEditorInterface::MXnTextEditorInterface* editorControl = NULL;
 XnComponentInterface::MakeInterfaceL( editorControl,
 iSplitScreenState.iPartialScreenEditorNode->AppIfL() );
 if( editorControl )
 // -----------------------------------------------------------------------------
 // NotifyStatusPaneSizeChanged
 // -----------------------------------------------------------------------------
 void CXnUiEngineImpl::NotifyStatusPaneSizeChanged()
 {
-TRAP_IGNORE( iUiEngine->SetClientRectL( iAppUiAdapter.ClientRect() ) );
+TRAP_IGNORE( iUiEngine->SetClientRectL( iAppUiAdapter.ClientRect(), EFalse ) );
 }
 // -----------------------------------------------------------------------------
 // NotifyResourceChanged
 // -----------------------------------------------------------------------------

branch	RCL_3
changeset 11	ff572dfe6d86
parent 9	f966699dea19
child 12	9674c1a575e9