idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp
branchRCL_3
changeset 88 3321d3e205b6
parent 83 5456b4e8b3a8
child 89 9f918e984081
child 102 ba63c83f4716
--- a/idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp	Tue Sep 14 20:58:58 2010 +0300
@@ -27,6 +27,7 @@
 #include "xnproperty.h"
 #include "xnuiengine.h"
 #include "xnappuiadapter.h"
+#include "xnkeyeventdispatcher.h"
 #include "xncontroladapter.h"
 #include "xnpopupcontroladapter.h"
 #include "xnmenuadapter.h"
@@ -51,7 +52,6 @@
 #include "xneffectmanager.h"
 #include "xnviewadapter.h"
 #include "xnbackgroundmanager.h"
-#include "xntexteditor.h"
 #include "xnitemactivator.h"
 
 // Local constants
@@ -337,10 +337,11 @@
 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 );
+    RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
 static CXnNode* FindNextNodeFromAboveL(
-    RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse );
+    RPointerArray< CXnNode >& aArray, CXnNode& aNode, TBool stayInNamespace = EFalse, CXnUiEngine* aEngine = NULL );
 static CXnNode* FindPluginNode( CXnNode& aNode );
+static TBool IsPluginNode( CXnNode& aNode );
 static TBool DoInternalFocusChangeL(
     CXnUiEngine& aEngine, CXnNode& aNode, const TKeyEvent& aKeyEvent,
     TEventCode aType );
@@ -2935,22 +2936,22 @@
         editorNode = &aLayoutNode;
         }
     
-    if( editorNode )
-        {
-        XnTextEditorInterface::MXnTextEditorInterface* editorControl = NULL;
+    if ( editorNode )
+        {             
+        CXnKeyEventDispatcher* eventDispatcher( 
+            aEngine.AppUiAdapter().ViewAdapter().EventDispatcher() );
         
-        XnComponentInterface::MakeInterfaceL( editorControl, editorNode->AppIfL() );
-        if( editorControl )
-            {
-            if( aActivate )
-                {
-                editorControl->HandleEditorEvent(CXnTextEditor::KActivateTextEditor);
+        if ( eventDispatcher )
+            {
+            if ( aActivate )
+                {
+                eventDispatcher->SetTextEditorActive( editorNode, ETrue );        
                 }
             else
                 {
-                editorControl->HandleEditorEvent(CXnTextEditor::KDeactivateTextEditor);
-                }
-            }    
+                eventDispatcher->SetTextEditorActive( NULL, EFalse );
+                }        
+            }        
         }
     }
 
@@ -3056,17 +3057,21 @@
     
     for ( TInt i = 0; i < plugins.Count(); i++ )
         {
-        CXnNode* node( plugins[i]->Owner()->LayoutNode() );
+        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 );        
@@ -3734,7 +3739,7 @@
                 }
             }
         
-        plugins.Append( &viewData );
+        plugins.AppendL( &viewData );
             
         RPointerArray< CXnNode > list;
         CleanupClosePushL( list );
@@ -4780,7 +4785,6 @@
     TBool stayInNamespace,
     CXnUiEngine* aEngine )
     {
-    
     CXnNode* nextNode = NULL;
     TRect rect = aNode.PaddingRect();
 
@@ -4800,6 +4804,14 @@
             // 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();
@@ -4923,6 +4935,14 @@
                 // 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();
@@ -5037,6 +5057,7 @@
         for ( TInt i = 0; i < aArray.Count(); ++i )
             {
             CXnNode* tmpNode = aArray[i];
+            
             if ( !IsNodeNavigableL( *tmpNode ) )
                 {
                 continue;
@@ -5046,6 +5067,14 @@
                 // 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();
@@ -5231,6 +5260,14 @@
             // 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();
@@ -5353,6 +5390,14 @@
                 // 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();       
@@ -5470,12 +5515,7 @@
         for ( TInt i = 0; i < aArray.Count(); ++i )
             {
             CXnNode* tmpNode = aArray[i];
-            /*
-            if ( tmpNode == &aNode )
-                {
-                continue;
-                }
-            */
+
             if ( !IsNodeNavigableL( *tmpNode ) )
                 {
                 continue;
@@ -5485,6 +5525,14 @@
                 // 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();
@@ -5649,7 +5697,8 @@
 //
 static CXnNode* FindNextNodeFromBelowL(
     RPointerArray< CXnNode >& aArray,
-    CXnNode& aNode, TBool stayInNamespace )
+    CXnNode& aNode, TBool stayInNamespace,
+    CXnUiEngine* aEngine )
     {
     CXnNode* nextNode = NULL;
     TRect rect = aNode.PaddingRect();
@@ -5669,6 +5718,14 @@
             {
             // 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();
@@ -5754,6 +5811,14 @@
                 // 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();
@@ -5825,7 +5890,8 @@
 //
 static CXnNode* FindNextNodeFromAboveL(
     RPointerArray< CXnNode >& aArray,
-    CXnNode& aNode, TBool stayInNamespace )
+    CXnNode& aNode, TBool stayInNamespace,
+    CXnUiEngine* aEngine )
     {
     CXnNode* nextNode = NULL;
     TRect rect = aNode.PaddingRect();
@@ -5846,6 +5912,14 @@
             // 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();       
@@ -5929,6 +6003,14 @@
                 // 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();       
@@ -6019,6 +6101,23 @@
     }
 
 // -----------------------------------------------------------------------------
+// IsPluginNode
+// -----------------------------------------------------------------------------
+//
+static TBool IsPluginNode( CXnNode& aNode )
+    {
+    TBool ret = EFalse;
+    
+    const TDesC8& nodeType = aNode.DomNode()->Name();
+    if( nodeType == KPlugin )
+        {
+        ret = ETrue;
+        }
+    
+    return ret;
+    }
+
+// -----------------------------------------------------------------------------
 // DoInternalFocusChangeL
 // -----------------------------------------------------------------------------
 //
@@ -6050,12 +6149,11 @@
     // "nav-index: appearance"...
     CXnProperty* navind = aNode.NavIndexL();
     if ( navind && navind->StringValue() == XnPropertyNames::style::common::KAppearance )
-        {
+        {        
+        CXnAppUiAdapter& appui( aEngine.AppUiAdapter() );
         
-        CXnAppUiAdapter& appui = static_cast< CXnAppUiAdapter& >( *iAvkonAppUi );
-        CXnPluginData* plugin( 
-                    appui.ViewManager().ActiveViewData().Plugin( &aNode ) );
-        
+        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 );
 
@@ -6063,11 +6161,11 @@
         RPointerArray< CXnNode >& array = aEngine.ViewManager()->AppearanceNodes();
         if ( aKeyEvent.iScanCode == EStdKeyDownArrow )
             {
-            nextNode = FindNextNodeFromBelowL( array, aNode, containsPopUp );
+            nextNode = FindNextNodeFromBelowL( array, aNode, containsPopUp, &aEngine );
             }
         else if ( aKeyEvent.iScanCode == EStdKeyUpArrow )
             {
-            nextNode = FindNextNodeFromAboveL( array, aNode, containsPopUp );
+            nextNode = FindNextNodeFromAboveL( array, aNode, containsPopUp, &aEngine );
             }
         else if ( aKeyEvent.iScanCode == EStdKeyRightArrow )
             {
@@ -6078,24 +6176,12 @@
             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;
             }
@@ -7956,18 +8042,15 @@
 // -----------------------------------------------------------------------------
 //
 void CXnNodeImpl::SetLaidOutL()
-    {
-    if ( !iLayoutCapable )
-        {
-        return;
-        }
-
-    if ( iDropped || !IsNodeDisplayedL( *iNode ) )
-        {
-        return;
-        }
-
-    iLaidOut = ETrue;
+    {       
+    if ( !iLayoutCapable || iDropped || !IsNodeDisplayedL( *iNode ) )
+        {
+        iLaidOut = EFalse;
+        }
+    else
+        {
+        iLaidOut = ETrue;
+        }
 
     for ( TInt i = 0; i < iChildren.Count(); i++ )
         {
@@ -9134,6 +9217,7 @@
     CleanupStack::PopAndDestroy( 2 ); // lockedNodes, lockedNodeIndex
     }
 
+/*
 // -----------------------------------------------------------------------------
 // CXnNodeImpl::FindNextNodeL
 // -----------------------------------------------------------------------------
@@ -9162,6 +9246,7 @@
         }
     return node;
     }
+*/    
 
 // -----------------------------------------------------------------------------
 // CXnNodeImpl::Namespace