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

equal deleted inserted replaced

-:b01126ce0bec
+:ba63c83f4716
 #include "xnnode.h"
 #include "xnpropertylist.h"
 #include "xnproperty.h"
 #include "xnuiengine.h"
 #include "xnappuiadapter.h"
-#include "xnkeyeventdispatcher.h"
 #include "xncontroladapter.h"
 #include "xnpopupcontroladapter.h"
 #include "xnmenuadapter.h"
 #include "xndomlist.h"
 #include "xndomdocument.h"
 #include "xnpanic.h"
 #include "xnlistquerydialogadapter.h"
 #include "xneffectmanager.h"
 #include "xnviewadapter.h"
 #include "xnbackgroundmanager.h"
+#include "xntexteditor.h"
 #include "xnitemactivator.h"
 // Local constants
 _LIT8( KId, "id" );
 _LIT8( KName, "name" );
 static CXnNode* FindNextNodeFromRightL(
 RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
 static CXnNode* FindNextNodeFromLeftL(
 RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
 static CXnNode* FindNextNodeFromBelowL(
-RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
+RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse );
 static CXnNode* FindNextNodeFromAboveL(
-RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
+RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse );
 static CXnNode* FindPluginNode( CXnNode& aNode );
-static TBool IsPluginNode( CXnNode& aNode );
 static TBool DoInternalFocusChangeL(
 CXnUiEngine& aEngine, CXnNode& aNode, const TKeyEvent& aKeyEvent,
 TEventCode aType );
 static TBool DoTriggerKeyEventL(
 CXnNodeImpl* aThis, CXnUiEngine& aEngine, CXnNode& aNode,
 if( !editorNode && aLayoutNode.Type()->Type() == KTextEditor )
 {
 editorNode = &aLayoutNode;
 }
-if ( editorNode )
+if( editorNode )
 {
-CXnKeyEventDispatcher* eventDispatcher(
+XnTextEditorInterface::MXnTextEditorInterface* editorControl = NULL;
-aEngine.AppUiAdapter().ViewAdapter().EventDispatcher() );
-if ( eventDispatcher )
+XnComponentInterface::MakeInterfaceL( editorControl, editorNode->AppIfL() );
-{
+if( editorControl )
-if ( aActivate )
+{
-{
+if( aActivate )
-eventDispatcher->SetTextEditorActive( editorNode, ETrue );
+{
+editorControl->HandleEditorEvent(CXnTextEditor::KActivateTextEditor);
 }
 else
 {
-eventDispatcher->SetTextEditorActive( NULL, EFalse );
+editorControl->HandleEditorEvent(CXnTextEditor::KDeactivateTextEditor);
 }
 }
 }
 }
 // -----------------------------------------------------------------------------
 // RunEditL
 TBool useEmpty( view->UseEmptyWidget() );
 for ( TInt i = 0; i < plugins.Count(); i++ )
 {
 CXnNode* node( plugins[i]->Owner()->LayoutNode() );
-TBool editable = plugins[i]->Editable();
-if( editable )
-{
-node->SetStateL( XnPropertyNames::style::common::KEdit );
-}
+node->SetStateL( XnPropertyNames::style::common::KEdit );
 if ( !plugins[i]->Occupied() && useEmpty )
 {
 // Make empty space visible
 SetStringPropertyToNodeL( *sp, *node,
 XnPropertyNames::style::common::KVisibility,
 XnPropertyNames::style::common::visibility::KVisible );
 }
 }
 aEngine.EditMode()->SetEditModeL( CXnEditMode::EDragAndDrop );
 aEngine.AppUiAdapter().ViewAdapter().CloseAllPopupsL();
 {
 plugins.AppendL( data );
 }
 }
-plugins.AppendL( &viewData );
+plugins.Append( &viewData );
 RPointerArray< CXnNode > list;
 CleanupClosePushL( list );
 for( TInt i = 0; i < plugins.Count(); i++ )
 RPointerArray< CXnNode >& aArray,
 CXnNode& aNode,
 TBool stayInNamespace,
 CXnUiEngine* aEngine )
 {
 CXnNode* nextNode = NULL;
 TRect rect = aNode.PaddingRect();
 for ( TInt i = 0; i < aArray.Count(); ++i )
 {
 }
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
-}
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
 }
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 CXnNode* candidateBelow = NULL;
 for ( TInt i = 0; i < aArray.Count(); ++i )
 {
 CXnNode* tmpNode = aArray[i];
 if ( !IsNodeNavigableL( *tmpNode ) )
 {
 continue;
 }
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 }
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
-}
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
 }
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 CXnNode* candidateBelow = NULL;
 for ( TInt i = 0; i < aArray.Count(); ++i )
 {
 CXnNode* tmpNode = aArray[i];
+/*
+if ( tmpNode == &aNode )
+{
+continue;
+}
+*/
 if ( !IsNodeNavigableL( *tmpNode ) )
 {
 continue;
 }
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 // FindNextNodeFromBelowL
 // -----------------------------------------------------------------------------
 //
 static CXnNode* FindNextNodeFromBelowL(
 RPointerArray< CXnNode >& aArray,
-CXnNode& aNode, TBool stayInNamespace,
+CXnNode& aNode, TBool stayInNamespace )
-CXnUiEngine* aEngine )
 {
 CXnNode* nextNode = NULL;
 TRect rect = aNode.PaddingRect();
 for ( TInt i = 0; i < aArray.Count(); ++i )
 }
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
-}
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
 }
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 // FindNextNodeFromAboveL
 // -----------------------------------------------------------------------------
 //
 static CXnNode* FindNextNodeFromAboveL(
 RPointerArray< CXnNode >& aArray,
-CXnNode& aNode, TBool stayInNamespace,
+CXnNode& aNode, TBool stayInNamespace )
-CXnUiEngine* aEngine )
 {
 CXnNode* nextNode = NULL;
 TRect rect = aNode.PaddingRect();
 for ( TInt i = 0; i < aArray.Count(); ++i )
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 if ( tmpNode->FindViewNode() != tmpNode->UiEngine()->ActiveView() )
 {
 // do not shift focus to another view
 continue;
 }
-if( aEngine->IsEditMode() )
-{
-if( !IsPluginNode( *tmpNode ) )
-{
-// move only between "plugin" nodes in edit mode
-continue;
-}
-}
 const TDesC8& tmpNamespace = tmpNode->Impl()->Namespace();
 const TDesC8& nodeNamespace = aNode.Impl()->Namespace();
 if ( stayInNamespace && tmpNamespace != nodeNamespace )
 return pluginNode;
 }
 // -----------------------------------------------------------------------------
-// IsPluginNode
-// -----------------------------------------------------------------------------
-//
-static TBool IsPluginNode( CXnNode& aNode )
-{
-TBool ret = EFalse;
-const TDesC8& nodeType = aNode.DomNode()->Name();
-if( nodeType == KPlugin )
-{
-ret = ETrue;
-}
-return ret;
-}
-// -----------------------------------------------------------------------------
 // DoInternalFocusChangeL
 // -----------------------------------------------------------------------------
 //
 static TBool DoInternalFocusChangeL( CXnUiEngine& aEngine,
 CXnNode& aNode, const TKeyEvent& aKeyEvent, TEventCode aType )
 // Handle 'appearance' navigation first, if the current node has
 // "nav-index: appearance"...
 CXnProperty* navind = aNode.NavIndexL();
 if ( navind && navind->StringValue() == XnPropertyNames::style::common::KAppearance )
 {
-CXnAppUiAdapter& appui( aEngine.AppUiAdapter() );
-CXnPluginData* plugin( appui.ViewManager().ActiveViewData().Plugin( &aNode ) );
+CXnAppUiAdapter& appui = static_cast< CXnAppUiAdapter& >( *iAvkonAppUi );
+CXnPluginData* plugin(
+appui.ViewManager().ActiveViewData().Plugin( &aNode ) );
 // find if node is in a widget that contatins some opened popup window
 TBool containsPopUp = ( plugin ? plugin->IsDisplayingPopup() : EFalse );
 CXnNode* nextNode( NULL );
 RPointerArray< CXnNode >& array = aEngine.ViewManager()->AppearanceNodes();
 if ( aKeyEvent.iScanCode == EStdKeyDownArrow )
 {
-nextNode = FindNextNodeFromBelowL( array, aNode, containsPopUp, &aEngine );
+nextNode = FindNextNodeFromBelowL( array, aNode, containsPopUp );
 }
 else if ( aKeyEvent.iScanCode == EStdKeyUpArrow )
 {
-nextNode = FindNextNodeFromAboveL( array, aNode, containsPopUp, &aEngine );
+nextNode = FindNextNodeFromAboveL( array, aNode, containsPopUp );
 }
 else if ( aKeyEvent.iScanCode == EStdKeyRightArrow )
 {
 nextNode = FindNextNodeFromRightL( array, aNode, containsPopUp, &aEngine );
 }
 else if ( aKeyEvent.iScanCode == EStdKeyLeftArrow )
 {
 nextNode = FindNextNodeFromLeftL( array, aNode, containsPopUp, &aEngine );
 }
 if ( nextNode )
 {
+// focus plugin node if in edit mode
+if( aEngine.IsEditMode() )
+{
+if( nextNode->Type()->Type() != KPlugin )
+{
+CXnNode* pluginNode = FindPluginNode( *nextNode );
+if( pluginNode )
+{
+nextNode = pluginNode;
+}
+}
+}
 if( nextNode && nextNode->ScrollableControl() )
 {
 nextNode->ScrollableControl()->ShowItem( *nextNode );
 }
 nextNode->SetStateL( XnPropertyNames::style::common::KFocus );
 return ETrue;
 }
 }
 else
 control->SetBlank( EFalse );
 if ( iDropped || !displayed )
 {
 // Need to check blank here
-CXnProperty* prop( VisibilityL() );
+CXnProperty* visibility( VisibilityL() );
+CXnProperty* display( DisplayL() );
-if ( prop && prop->StringValue() ==
-XnPropertyNames::style::common::visibility::KBlank )
+if ( visibility && visibility->StringValue() ==
+XnPropertyNames::style::common::visibility::KBlank &&
+( !display || display->StringValue()
+== XnPropertyNames::style::common::display::KBlock ) )
 {
 control->SetBlank( ETrue );
 control->MakeVisible( EFalse );
 control->SetComponentsToInheritVisibility( EFalse );
 control->MakeVisible( ETrue );
 // -----------------------------------------------------------------------------
 // CXnNodeImpl::SetLaidOutL
 // -----------------------------------------------------------------------------
 //
 void CXnNodeImpl::SetLaidOutL()
 {
-if ( !iLayoutCapable || iDropped || !IsNodeDisplayedL( *iNode ) )
+if ( !iLayoutCapable )
 {
-iLaidOut = EFalse;
+return;
 }
-else
-{
+if ( iDropped || !IsNodeDisplayedL( *iNode ) )
-iLaidOut = ETrue;
+{
-}
+return;
+}
+iLaidOut = ETrue;
 for ( TInt i = 0; i < iChildren.Count(); i++ )
 {
 iChildren[i]->SetLaidOutL();
 }
 lockedNodes.Reset();
 lockedNodeIndex.Reset();
 CleanupStack::PopAndDestroy( 2 ); // lockedNodes, lockedNodeIndex
 }
-/*
 // -----------------------------------------------------------------------------
 // CXnNodeImpl::FindNextNodeL
 // -----------------------------------------------------------------------------
 //
 CXnNode* CXnNodeImpl::FindNextNodeL(
 {
 node = FindNextNodeFromBelowL( aArray, aNode );
 }
 return node;
 }
-*/
 // -----------------------------------------------------------------------------
 // CXnNodeImpl::Namespace
 // -----------------------------------------------------------------------------
 //

branch	RCL_3
changeset 102	ba63c83f4716
parent 88	3321d3e205b6
child 103	966d119a7e67