Add layer type & Create native node when attached

Change-Id: I2f689eef8b461bb6dd9fbe13fa4920796966fe7d
Signed-off-by: jisun10.lee <jisun10.lee@samsung.com>

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index 3458831..95d0d4d 100644 (file)
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -4966,12 +4966,16 @@ _Control::PrintDescription(bool printChildren, int depth, int level)
                break;
 
        case PRINT_CONTROL_EVAS:
+#ifdef ENABLE_VE_EFL
                _VeDebug::DumpEvasTree(pVisualElementImpl, 0);
+#endif
                break;
 
        case PRINT_CONTROL_VE_EVAS:
                _VeDebug::DumpVeTree(pVisualElementImpl, 0);
+#ifdef ENABLE_VE_EFL
                _VeDebug::DumpEvasTree(pVisualElementImpl, 0);
+#endif
                break;
 
        default:

diff --git a/src/ui/FUi_ControlManager.cpp b/src/ui/FUi_ControlManager.cpp
index 2d0dce6..3e488af 100644 (file)
--- a/src/ui/FUi_ControlManager.cpp
+++ b/src/ui/FUi_ControlManager.cpp
@@ -1075,10 +1075,9 @@ _ControlManager::GetTouchedWindow(void) const
                }
 
                _NativeLayer* pLayer = pRootVE->GetNativeLayer();
-               _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-
-               if (pEflLayer)
+               if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
                {
+                       _EflLayer* pEflLayer = static_cast<_EflLayer*>(pLayer);
                        Ecore_Evas* pEcoreEvas = pEflLayer->GetEcoreEvas();
                        Ecore_X_Window win = (Ecore_X_Window) ecore_evas_window_get(pEcoreEvas);
                        

diff --git a/src/ui/animations/FUiAnimSceneVisualElement.cpp b/src/ui/animations/FUiAnimSceneVisualElement.cpp
index 3488e02..2c790ee 100644 (file)
--- a/src/ui/animations/FUiAnimSceneVisualElement.cpp
+++ b/src/ui/animations/FUiAnimSceneVisualElement.cpp
@@ -57,8 +57,7 @@ SceneVisualElement::SceneVisualElement(void)
 
 SceneVisualElement::~SceneVisualElement(void)
 {
-       _pSceneVisualElementImpl->Destroy();
-       _pSceneVisualElementImpl = null;
+
 }
 
 result

diff --git a/src/ui/animations/FUiAnim_Debug.cpp b/src/ui/animations/FUiAnim_Debug.cpp
index 2f4403f..16d421d 100644 (file)
--- a/src/ui/animations/FUiAnim_Debug.cpp
+++ b/src/ui/animations/FUiAnim_Debug.cpp
@@ -1055,18 +1055,13 @@ _VeDebug::DumpVeTree(_VisualElementImpl* pElement, int indent)
        return;
 }
 
-
+#ifdef ENABLE_VE_EFL
 void
 _VeDebug::DumpEvasTree(_VisualElementImpl* pElement, int indent)
 {
-#ifdef ENABLE_VE_EFL
        if (!pElement)
        {
-               _DisplayManager* pDisplayManager = _DisplayManager::GetInstance();
-               if (pDisplayManager != null && pDisplayManager->GetLayer(0))
-               {
-                       pElement = _VisualElementImpl::GetInstance(*pDisplayManager->GetLayer(0)->GetRootVisualElement());
-               }
+               return;
        }
 
        bool prevDebugEnabled = IsDebugEnabled();
@@ -1091,12 +1086,10 @@ _VeDebug::DumpEvasTree(_VisualElementImpl* pElement, int indent)
        }
 
        SetDebugEnabled(prevDebugEnabled);
-#endif
+
        return;
 }
 
-
-#ifdef ENABLE_VE_EFL
 void
 _VeDebug::DumpEvasTreeI(Evas_Object* pParent, int indent)
 {
@@ -1483,27 +1476,14 @@ _VeDebug::DumpVeTreeGraphI(FILE* pFile, _VisualElementImpl* pVisualElementImpl,
        SetDebugEnabled(prevDebugEnabled);
 }
 
+#ifdef ENABLE_VE_EFL
 void
 _VeDebug::DumpEvasTreeGraph(const char* pFilePath, VisualElement* pVisualElement)
 {
-#ifdef VE_EFL
        _VisualElementImpl* pElement = null;
 
        if (!pVisualElement)
        {
-               _DisplayManager* pDisplayManager = _DisplayManager::GetInstance();
-               if (pDisplayManager != null && pDisplayManager->GetRoot(0))
-               {
-                       pElement = _VisualElementImpl::GetInstance(*pDisplayManager->GetRoot(0));
-               }
-       }
-       else
-       {
-               pElement = _VisualElementImpl::GetInstance(*pVisualElement);
-       }
-
-       if (!pElement)
-       {
                return;
        }
 
@@ -1556,10 +1536,9 @@ _VeDebug::DumpEvasTreeGraph(const char* pFilePath, VisualElement* pVisualElement
        fprintf(pFile, "}\n\n");
 
        fclose(pFile);
-#endif
+
 }
 
-#ifdef ENABLE_VE_EFL
 void
 _VeDebug::DumpAllEvas(Evas* pEvas)
 {
@@ -1685,7 +1664,6 @@ _VeDebug::DumpAllEvasImages(Evas *pEvas)
 
        VeLog(NID_UI_ANIM, "--------------------------[EVAS ALL DUMP IMAGE END]-----------------------------");
 }
-
 #endif
 
 void
@@ -1829,19 +1807,11 @@ _VeDebug::DumpVeImage(_VisualElementImpl* pElement, const char* pathPrefix)
        Tizen::Base::String name = pElement->GetName();
        if (name.GetLength() > 0)
        {
-#ifdef VE_EFL
-               snprintf(filename, FILEN_NAME_LEN, "%sVE_%d_%ls_%08x.png", pathPrefix, count++, pElement->GetName().GetPointer(), (unsigned int)pElement->GetPresentationClone());
-#else
                snprintf(filename, FILEN_NAME_LEN, "%sVE_%d_%ls_%08x.png", pathPrefix, count++, pElement->GetName().GetPointer(), (unsigned int)pElement->GetRenderObject());
-#endif
        }
        else
        {
-#ifdef VE_EFL
-               snprintf(filename, FILEN_NAME_LEN, "%sVE_%d_%08x.png", pathPrefix, count++, (unsigned int)pElement->GetPresentationClone());
-#else
                snprintf(filename, FILEN_NAME_LEN, "%sVE_%d_%08x.png", pathPrefix, count++, (unsigned int)pElement->GetRenderObject());
-#endif
        }
 
        VisualElementSurface* pSurface = pElement->__pSharedData->pNativeNode->GetSurface();
@@ -2036,9 +2006,9 @@ DumpVeLayout(void)
     for (int i = 0; i < pDisplayManager->GetLayerCount(); i++)
        {
         Tizen::Ui::Animations::_VisualElementImpl* pVisualElementImpl = const_cast<Tizen::Ui::Animations::_VisualElementImpl*>(Tizen::Ui::Animations::_VisualElementImpl::GetInstance(*pDisplayManager->GetLayer(i)->GetRootVisualElement()->AcquirePresentationInstance()));
-#ifndef VE_EFL
+
                pVisualElementImpl = pVisualElementImpl->GetRenderObject();
-#endif
+
                if (pVisualElementImpl)
                {
                        Tizen::Ui::Animations::_VeDebug::DumpVeLayout(pVisualElementImpl, 0, pFile);
@@ -2118,16 +2088,22 @@ DumpVeTree(void)
 extern "C" _OSP_EXPORT_ void
 DumpEvasTree(void)
 {
+#ifdef ENABLE_VE_EFL
        Tizen::Ui::Animations::_DisplayManager* pDisplayManager = Tizen::Ui::Animations::_DisplayManager::GetInstance();
 
        for (int i = 0; i < pDisplayManager->GetLayerCount(); i++)
        {
-               Tizen::Ui::Animations::_VisualElementImpl* pVisualElementImpl = Tizen::Ui::Animations::_VisualElementImpl::GetInstance(*pDisplayManager->GetLayer(i)->GetRootVisualElement());
-               if (pVisualElementImpl)
+               Tizen::Ui::Animations::_NativeLayer* pLayer = pDisplayManager->GetLayer(i);
+               if (pLayer->GetLayerType() == Tizen::Ui::Animations::_LAYER_TYPE_EFL)
                {
-                       Tizen::Ui::Animations::_VeDebug::DumpEvasTree(pVisualElementImpl, 0);
+                       Tizen::Ui::Animations::_VisualElementImpl* pVisualElementImpl = Tizen::Ui::Animations::_VisualElementImpl::GetInstance(*pLayer->GetRootVisualElement());
+                       if (pVisualElementImpl)
+                       {
+                               Tizen::Ui::Animations::_VeDebug::DumpEvasTree(pVisualElementImpl, 0);
+                       }
                }
        }
+#endif
 }
 
 extern "C" _OSP_EXPORT_ void
@@ -2148,7 +2124,7 @@ DumpAllVeImages(void)
 extern "C" _OSP_EXPORT_ void
 DumpAllEvas(void)
 {
-#ifdef VE_EFL
+#ifdef ENABLE_VE_EFL
        Tizen::Ui::Animations::_DisplayManager* pDisplayManager = Tizen::Ui::Animations::_DisplayManager::GetInstance();
 
        for (int i = 0; i < pDisplayManager->GetLayerCount(); i++)
@@ -2204,14 +2180,21 @@ DumpAllEvasImages(void)
 extern "C" _OSP_EXPORT_ void
 DumpEvasTreeGraph(void)
 {
+#ifdef ENABLE_VE_EFL
        Tizen::Ui::Animations::_DisplayManager* pDisplayManager = Tizen::Ui::Animations::_DisplayManager::GetInstance();
 
        for (int i = 0; i < pDisplayManager->GetLayerCount(); i++)
        {
-               char filePath[256];
-               snprintf(filePath, sizeof(filePath), "/tmp/graph_%d.dot", i);
-               Tizen::Ui::Animations::_VeDebug::DumpEvasTreeGraph(filePath, pDisplayManager->GetLayer(i)->GetRootVisualElement());
+               Tizen::Ui::Animations::_NativeLayer* pLayer = pDisplayManager->GetLayer(i);
+               if (pLayer->GetLayerType() == Tizen::Ui::Animations::_LAYER_TYPE_EFL)
+               {
+                       char filePath[256];
+                       snprintf(filePath, sizeof(filePath), "/tmp/graph_%d.dot", i);
+                       
+                       Tizen::Ui::Animations::_VeDebug::DumpEvasTreeGraph(filePath, pLayer->GetRootVisualElement());
+               }
        }
+#endif
 }
 
 #ifdef  __i386__

diff --git a/src/ui/animations/FUiAnim_Debug.h b/src/ui/animations/FUiAnim_Debug.h
index 669dd46..8d7fe63 100644 (file)
--- a/src/ui/animations/FUiAnim_Debug.h
+++ b/src/ui/animations/FUiAnim_Debug.h
@@ -173,21 +173,17 @@ public:
        static void SetDebugEnabled(bool enable);
        static bool IsDebugEnabled(void);
 
-       static void DumpEvasTree(_VisualElementImpl* pElement, int indent);
 #ifdef ENABLE_VE_EFL
+       static void DumpEvasTree(_VisualElementImpl* pElement, int indent);
        static void DumpAllEvas(Evas* pEvas);
        static void DumpAllEvasImages(Evas* pEvas);
-#endif
-
-#ifdef ENABLE_VE_EFL
        static void DumpEvasObjectForGraphI(FILE* pFile, Evas_Object* pEvasObject, int depth, int pos);
        static void DumpEvasTreeGraphI(FILE* pFile, Evas_Object* pObject, int depth, int pos);
+       static void DumpEvasTreeGraph(const char* pFilePath, VisualElement* pVisualElement);
 #endif
        static void DumpVeObjectForGraphI(FILE* pFile, _VisualElementImpl* pVisualElementImpl, int depth, int pos);
        static void DumpVeTreeGraphI(FILE* pFile, _VisualElementImpl* pVisualElementImpl, int depth, int pos);
 
-       static void DumpEvasTreeGraph(const char* pFilePath, VisualElement* pVisualElement);
-
 
 private:
        _VeDebug(void);

diff --git a/src/ui/animations/FUiAnim_DisplayManager.cpp b/src/ui/animations/FUiAnim_DisplayManager.cpp
index add9fe3..0d1cb43 100644 (file)
--- a/src/ui/animations/FUiAnim_DisplayManager.cpp
+++ b/src/ui/animations/FUiAnim_DisplayManager.cpp
@@ -208,8 +208,7 @@ _DisplayManager::HasUpdates()
                if (likely(pLayer))
                {
 #ifdef ENABLE_VE_EFL
-                       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-                       if (pEflLayer)
+                       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
                        {
                                continue;
                        }
@@ -243,8 +242,7 @@ _DisplayManager::RenderAll(bool isMainThread)
                if (likely(pLayer))
                {
 #ifdef ENABLE_VE_EFL
-                       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-                       if (pEflLayer)
+                       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
                        {
                                continue;
                        }
@@ -332,8 +330,7 @@ _DisplayManager::Flush(void)
                if(pLayer)
                {
 #ifdef ENABLE_VE_EFL
-                       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-                       if (pEflLayer)
+                       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
                        {
                                continue;
                        }

diff --git a/src/ui/animations/FUiAnim_EflLayer.cpp b/src/ui/animations/FUiAnim_EflLayer.cpp
index 9e70213..9fcd781 100755 (executable)
--- a/src/ui/animations/FUiAnim_EflLayer.cpp
+++ b/src/ui/animations/FUiAnim_EflLayer.cpp
@@ -201,13 +201,12 @@ OnIdleLoopIterate(void* pData)
 
                if (likely(pLayer))
                {
-                       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-                       if (pEflLayer)
+                       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
                        {
-                               if(pEflLayer->Render())
-                                       pDisplayManager->PostRender(*pEflLayer, true);
+                               if(pLayer->Render())
+                                       pDisplayManager->PostRender(*pLayer, true);
                                
-                               pEflLayer->Flush();
+                               pLayer->Flush();
                        }
                }
        }
@@ -551,7 +550,7 @@ _EflLayer::Configure(_RootVisualElement& rootElement)
        if (pNode)
        {
                _pRootVisualElement = &rootElement;
-               return pNode->ReConstruct(*this);
+               return pNode->Construct(*this);
        }
 
        return E_SYSTEM;

diff --git a/src/ui/animations/FUiAnim_EflNode.cpp b/src/ui/animations/FUiAnim_EflNode.cpp
index db3c958..ede5aef 100644 (file)
--- a/src/ui/animations/FUiAnim_EflNode.cpp
+++ b/src/ui/animations/FUiAnim_EflNode.cpp
@@ -222,34 +222,74 @@ _EflNode::_EflNode(void)
 
 _EflNode::~_EflNode(void)
 {
-       Destruct();
-}
+       __pEvas = null;
+       if (__pSmartObject)
+       {
+               evas_object_del(__pSmartObject);
+               __pSmartObject = null;
+       }
 
-result
-_EflNode::Construct(void)
-{
-       return E_SUCCESS;
+       if (__pClipObject)
+       {
+               evas_object_del(__pClipObject);
+               __pClipObject = null;
+       }
+
+       if (__pRectangleObject)
+       {
+               evas_object_del(__pRectangleObject);
+               __pRectangleObject = null;
+       }
+
+       if (__pMap)
+       {
+               evas_map_free(__pMap);
+               __pMap = null;
+       }
+
+       if (__pSurface)
+       {
+               delete __pSurface;
+               __pSurface = null;
+       }
+
+       if (__pSharedSurface)
+       {
+               delete __pSharedSurface;
+               __pSharedSurface = null;
+       }
+
+       if (__pImageHolder)
+       {
+               evas_object_del(__pImageHolder);
+       }
+
+       if (unlikely(__pNativeSmartObject))
+       {
+               evas_object_smart_member_del(__pNativeSmartObject);
+               //__pNativeSmartObject = null;
+       }
 }
 
 result
-_EflNode::RebuildIfNeeded(const _INativeNode& parent)
+_EflNode::Construct(const _INativeNode& parent)
 {
        _EflNode* pParent = dynamic_cast<_EflNode*>(const_cast<_INativeNode*>(&parent));
        if (!pParent)
        {
-               return E_INVALID_ARG;
+               return E_INVALID_ARG;   //need?
        }
+
        if (pParent->__pLayer)
        {
-               return ReConstruct(*pParent->__pLayer);
+               return Construct(*pParent->__pLayer);
        }
+
        return E_INVALID_STATE;
-//     __pLayer = pParent->pLayer;
-       //return ReConstruct(pParent->__pEvas);
 }
 
 result
-_EflNode::ReConstruct(const _NativeLayer& layer)
+_EflNode::Construct(const _NativeLayer& layer)
 {
        if (__pLayer == &layer)
        {
@@ -262,21 +302,13 @@ _EflNode::ReConstruct(const _NativeLayer& layer)
                return E_INVALID_ARG;
        }
        __pLayer = pLayer;
-       return ReConstruct(pLayer->GetEvas());
-}
 
-result
-_EflNode::ReConstruct(const Evas* pEvas)
-{
-       if (pEvas == null)
+       if (pLayer->GetEvas() == null)
        {
                return E_INVALID_ARG;
        }
 
-       Destruct();
-
-       __pEvas = const_cast<Evas*>(pEvas);
-
+       __pEvas = const_cast<Evas*>(pLayer->GetEvas());
 
        if (!__pStaticSmartClass)
        {
@@ -306,16 +338,6 @@ _EflNode::ReConstruct(const Evas* pEvas)
 
        evas_object_show(__pSmartObject);
 
-//     __pClipObject = evas_object_rectangle_add(pEvas);
-//     if (!__pClipObject)
-//             goto failure;
-//
-//
-//     evas_object_smart_member_add(__pClipObject,__pSmartObject);
-//     evas_object_lower(__pClipObject);
-//
-//     evas_object_pass_events_set(__pClipObject, EINA_TRUE);
-
        // Create map for 3D
        if (__pMap)
        {
@@ -342,11 +364,6 @@ failure:
 
        __pSmartObject = null;
 
-//     if (__pClipObject)
-//             evas_object_del(__pClipObject);
-//
-//     __pClipObject = null;
-
        if (__pMap)
        {
                evas_map_free(__pMap);
@@ -357,60 +374,6 @@ failure:
        return E_SYSTEM;
 }
 
-result
-_EflNode::Destruct(void)
-{
-       __pEvas = null;
-       if (__pSmartObject)
-       {
-               evas_object_del(__pSmartObject);
-               __pSmartObject = null;
-       }
-
-       if (__pClipObject)
-       {
-               evas_object_del(__pClipObject);
-               __pClipObject = null;
-       }
-
-       if (__pRectangleObject)
-       {
-               evas_object_del(__pRectangleObject);
-               __pRectangleObject = null;
-       }
-
-       if (__pMap)
-       {
-               evas_map_free(__pMap);
-               __pMap = null;
-       }
-
-       if (__pSurface)
-       {
-               delete __pSurface;
-               __pSurface = null;
-       }
-
-       if (__pSharedSurface)
-       {
-               delete __pSharedSurface;
-               __pSharedSurface = null;
-       }
-
-       if (__pImageHolder)
-       {
-               evas_object_del(__pImageHolder);
-       }
-
-       if (unlikely(__pNativeSmartObject))
-       {
-               evas_object_smart_member_del(__pNativeSmartObject);
-               //__pNativeSmartObject = null;
-       }
-
-       return E_SUCCESS;
-}
-
 Evas*
 _EflNode::GetEvas(void) const
 {

diff --git a/src/ui/animations/FUiAnim_GlLayer.cpp b/src/ui/animations/FUiAnim_GlLayer.cpp
index 21e6fa4..b1f008d 100644 (file)
--- a/src/ui/animations/FUiAnim_GlLayer.cpp
+++ b/src/ui/animations/FUiAnim_GlLayer.cpp
@@ -96,20 +96,19 @@ _GlLayer::OnConstructed(void)
 result
 _GlLayer::Configure(_RootVisualElement& rootElement)
 {
+       //_VisualElementImpl* pImpl = _VisualElementImpl::GetInstance(rootElement);
+       //if(!pImpl)
+       //      return E_SYSTEM;
 
-       _VisualElementImpl* pImpl = _VisualElementImpl::GetInstance(rootElement);
-       if(!pImpl)
-               return E_SYSTEM;
+       //_GlNode* pNode = dynamic_cast<_GlNode*>(pImpl->GetNativeNode());
+       //if (pNode)
+       //{
+       //      __pRootVisualElement = &rootElement;
 
-       _GlNode* pNode = dynamic_cast<_GlNode*>(pImpl->GetNativeNode());
-       if (pNode)
-       {
-               __pRootVisualElement = &rootElement;
-
-               return pNode->ReConstruct(*this);
-       }
+       //      return pNode->ReConstruct(*this);
+       //}
 
-       return E_SYSTEM;
+       return E_SUCCESS;
 }
 
 result

diff --git a/src/ui/animations/FUiAnim_GlNode.cpp b/src/ui/animations/FUiAnim_GlNode.cpp
index b8a8a6c..c6092bc 100644 (file)
--- a/src/ui/animations/FUiAnim_GlNode.cpp
+++ b/src/ui/animations/FUiAnim_GlNode.cpp
@@ -101,31 +101,6 @@ _GlNode::_GlNode(void)
 
 _GlNode::~_GlNode(void)
 {
-       Destruct();
-       __activeLight.RemoveAll();
-}
-
-result
-_GlNode::Construct(void)
-{
-       return E_SUCCESS;
-}
-
-result
-_GlNode::ReConstruct(const _NativeLayer& layer)
-{
-       return E_SUCCESS;
-}
-
-result
-_GlNode::RebuildIfNeeded(const _INativeNode& parent)
-{
-       return E_SUCCESS;
-}
-
-result
-_GlNode::Destruct(void)
-{
        if (__pSurface && _VisualElementSurfaceImpl::GetInstance(*__pSurface))
        {
                delete __pSurface;
@@ -172,6 +147,12 @@ _GlNode::Destruct(void)
                __pMaterial = null;
        }
 
+       __activeLight.RemoveAll();
+}
+
+result
+_GlNode::Construct(const _INativeNode& parent)
+{
        return E_SUCCESS;
 }
 

diff --git a/src/ui/animations/FUiAnim_GlNode.h b/src/ui/animations/FUiAnim_GlNode.h
index 119ce5c..baad31e 100644 (file)
--- a/src/ui/animations/FUiAnim_GlNode.h
+++ b/src/ui/animations/FUiAnim_GlNode.h
@@ -55,10 +55,7 @@ public:
        _GlNode(void);
        virtual ~_GlNode(void);
 
-       virtual result Construct(void);
-       virtual result RebuildIfNeeded(const _INativeNode& parent);
-
-       result ReConstruct(const _NativeLayer& layer);
+       virtual result Construct(const _INativeNode& parent);
 
 public:
        virtual result InsertChild(_INativeNode& child, const _INativeNode* pReference, bool above);
@@ -68,8 +65,8 @@ public:
        virtual result Reconfigure(VisualElementSurface* pSurface, _VisualElementImpl& element, bool surfaceOnly);
        virtual VisualElementSurface* GetSurface(void) const;
 
-       _Colorf GetBackgroundColor(void) const;
-       result SetBackgroundColor(const _Colorf& backgroundColor);
+       virtual _Colorf GetBackgroundColor(void) const;
+       virtual result SetBackgroundColor(const _Colorf& backgroundColor);
 
        result Capture(Tizen::Graphics::Canvas& destination, const Tizen::Graphics::Point& destPosition, const Tizen::Graphics::Rectangle& bounds);
 
@@ -77,9 +74,6 @@ public:
        result SyncStatus(VisualElementSurface* pSurface, _VisualElementImpl& element);
 
 private:
-       result Destruct(void);
-
-private:
        _GlNode(const _GlNode& rhs);              // no impl.
        _GlNode& operator =(const _GlNode& rhs);  // no impl.
 

diff --git a/src/ui/animations/FUiAnim_NativeLayer.cpp b/src/ui/animations/FUiAnim_NativeLayer.cpp
index d3e24d6..f4ea603 100644 (file)
--- a/src/ui/animations/FUiAnim_NativeLayer.cpp
+++ b/src/ui/animations/FUiAnim_NativeLayer.cpp
@@ -64,6 +64,7 @@ _NativeLayer::_NativeLayer(void)
        , __needFlush(false)
 //     , __needUpdateRenderObjects(false)
 //    , __didSyncPresentation(false)
+       , __type(_LAYER_TYPE_GL)
 {
        static unsigned long idCount = 0;
        __id = idCount++;
@@ -157,18 +158,24 @@ _NativeLayer::Construct(void)
 result
 _NativeLayer::Construct(_NativeWindow* pNativeWindow)
 {
-
        result r = E_SUCCESS;
 
        if (pNativeWindow)
        {
                _pWindow = pNativeWindow;
        }
+       else
+       {
+               __type = _LAYER_TYPE_EFL;
+       }
 
        SysAssertf(_pRootVisualElement == null, "Already constructed! Calling Construct() twice or more on a same instance is not allowed for this class.");
 
-       _pRootVisualElement = new SceneVisualElement();
 
+       r = OnConstructed();
+       SysTryReturnResult(NID_UI_ANIM, r == E_SUCCESS, r, "Constructing failed.");
+
+       _pRootVisualElement = new SceneVisualElement();
        if (_pRootVisualElement)
        {
                DisplayContext* pDisplayContext = GetDisplayContext();
@@ -194,9 +201,6 @@ _NativeLayer::Construct(_NativeWindow* pNativeWindow)
 
        _DisplayManager* pDisplayManager = _DisplayManager::GetInstance();
 
-       r = OnConstructed();
-       SysTryReturnResult(NID_UI_ANIM, r == E_SUCCESS, r, "Constructing failed.");
-
        if (pDisplayManager)
        {
                pDisplayManager->RegisterLayer(*this);
@@ -528,4 +532,10 @@ _NativeLayer::GetId(void) const
        return __id;
 }
 
+_LayerType
+_NativeLayer::GetLayerType(void) const
+{
+       return __type;
+}
+
 }}}

diff --git a/src/ui/animations/FUiAnim_RootVisualElement.cpp b/src/ui/animations/FUiAnim_RootVisualElement.cpp
index 3672407..1f91d95 100644 (file)
--- a/src/ui/animations/FUiAnim_RootVisualElement.cpp
+++ b/src/ui/animations/FUiAnim_RootVisualElement.cpp
@@ -96,12 +96,7 @@ _RootVisualElement::SetNativeLayer(_NativeLayer* pLayer, bool useEfl)
        SysTryReturnResult(NID_UI_ANIM, !__pLayer || (__pLayer && pLayer == null), E_INVALID_STATE, "The layer is already assigned to another RootVisualElement instance.");
        __pLayer = pLayer;
 
-#ifdef ENABLE_VE_EFL   
-       if (useEfl)
-       {
-               _pVisualElementImpl->GetSharedData().ChangeNativeNode(*_pVisualElementImpl->__pRenderObject, false);
-       }
-#endif
+       _pVisualElementImpl->GetSharedData().CreateNativeNode(useEfl);
 
        _RootVisualElement* pPresentation = null;
        if (_pVisualElementImpl && _pVisualElementImpl->__pRenderObject)

diff --git a/src/ui/animations/FUiAnim_VisualElement.cpp b/src/ui/animations/FUiAnim_VisualElement.cpp
index 55a85f9..a27b123 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElement.cpp
+++ b/src/ui/animations/FUiAnim_VisualElement.cpp
@@ -24,10 +24,7 @@
 
 #include <FBaseSysLog.h>
 
-#ifdef ENABLE_VE_EFL
-#include "FUiAnim_EflNode.h"
-#endif
-#include "FUiAnim_GlNode.h"
+#include "FUiAnim_INativeNode.h"
 
 #include "FUiAnim_VisualElement.h"
 #include "FUiAnim_VisualElementImpl.h"
@@ -66,47 +63,29 @@ _VisualElement::_VisualElement(const _VisualElement& rhs)
 _Colorf
 _VisualElement::GetBackgroundColor(void) const
 {
-#ifdef ENABLE_VE_EFL
-       _EflNode* pEflNode = dynamic_cast< _EflNode* >(_pVisualElementImpl->GetNativeNode());
-       if(pEflNode)
+       _INativeNode* pNode = GetNativeNode();
+       if (pNode)
        {
-               return pEflNode->GetBackgroundColor();
+               return pNode->GetBackgroundColor();
        }
        else
-#endif
        {
-               _GlNode* pGlNode = dynamic_cast< _GlNode* >(_pVisualElementImpl->GetNativeNode());
-
-               SysTryReturn(NID_UI, pGlNode, _Colorf(0.0f, 0.0f, 0.0f, 1.0f), E_INVALID_STATE, "[E_INVALID_STATE] No object for background.");   // CHECKME: Default BG?
-
-               return pGlNode->GetBackgroundColor();
+               return _pVisualElementImpl->GetNativeNodeColor();
        }
 }
 
 result
 _VisualElement::SetBackgroundColor(const _Colorf& color)
 {
-       result r = E_SUCCESS;
-
-#ifdef ENABLE_VE_EFL
-       _EflNode* pEflNode = dynamic_cast< _EflNode* >(_pVisualElementImpl->GetNativeNode());
-       if(pEflNode)
+       _INativeNode* pNode = GetNativeNode();
+       if (pNode)
        {
-               r = pEflNode->SetBackgroundColor(color);
+               return pNode->SetBackgroundColor(color);
        }
        else
-#endif
        {
-               _GlNode* pGlNode = dynamic_cast< _GlNode* >(_pVisualElementImpl->GetNativeNode());
-
-               SysTryReturnResult(NID_UI, pGlNode, E_INVALID_STATE, "No object for background.");   // CHECKME: Default BG?
-
-               r = pGlNode->SetBackgroundColor(color);
+               return _pVisualElementImpl->SetNativeNodeColor(color);
        }
-//     if (_pVisualElementImpl->GetRenderObject()) (_pVisualElementImpl->GetRenderObject())->InvalidateHierarchyProps((int)_VisualElementImpl::HIERARCHY_PROPERTY_NATIVENODE, false, false);
-//     if (_pVisualElementImpl->GetRenderObject()) (_pVisualElementImpl->GetRenderObject())->InvalidateHierarchyProps((int)_VisualElementImpl::UPDATED_PROP_CONTENT, false, false);
-
-       return r;
 }
 
 FloatRectangle

diff --git a/src/ui/animations/FUiAnim_VisualElementImpl.cpp b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
index 8804246..1d89c8e 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementImpl.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementImpl.cpp
@@ -411,6 +411,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& element)
        , __renderOperation(VisualElement::RENDER_OPERATION_BLEND)
        , __pBoundsChangedCallback(null)
        , __pBoundsChangedCallbackData(null)
+       , __hasColor(false)
+       , __color(0.0f, 0.0f, 0.0f, 0.0f)
 {
        ClearLastResult();
 
@@ -476,6 +478,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& presentation, _VisualEleme
        , __renderOperation(modelImpl.__renderOperation)
        , __pBoundsChangedCallback(null)
        , __pBoundsChangedCallbackData(null)
+       , __hasColor(modelImpl.__hasColor)
+       , __color(modelImpl.__color)
 {
        ClearLastResult();
 
@@ -785,9 +789,6 @@ _VisualElementImpl::Construct(void)
        SysTryCatch(NID_UI_ANIM, GetSharedData().Construct() == E_SUCCESS, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] failed in shared data constructing.");
 
        __pModel = this;
-//     __pPresentation = null;
-//     __pRenderObject = null;
-       //SysLog(NID_UI_ANIM, "Created(efl=%p)", GetSharedData().pNativeNode);
 
 #if 0 // REMOVED : We should invoke property observer method manually.
        if (__isPropertyPropagationEnabled)
@@ -1632,7 +1633,6 @@ _VisualElementImpl::SetImageSource(const String& filePath)
        // Fully invalidate because new surface should be allocated and redrawn
        GetSharedData().invalidatedRegion.SetBounds(0.0f, 0.0f, __bounds.width, __bounds.height);
 
-
        RebuildHierarchyProps(0, true, true);
 
        SysTryReturnResult(NID_UI_ANIM, HAVE_SURFACE(this), E_SYSTEM, "Realizing back-buffer surface failed.");
@@ -5021,14 +5021,6 @@ _VisualElementImpl::ChangeZOrder(_VisualElementImpl& child, const _VisualElement
                return E_INVALID_ARG;
        }
 
-#if defined (ENABLE_VE_EFL)
-               if (GetSharedData().__useEfl && (GetSharedData().__useEfl != child.GetSharedData().__useEfl))
-               {
-                       SysTryReturnResult(NID_UI_ANIM, child.GetSharedData().pSurface == null, E_INVALID_ARG, "can't attach child with surface to EFL parent.");
-                       ChangeNativeNode(child);
-               }
-#endif
-
        // TBD: check ownership!!!
        if (IS_RENDER_OBJECT(this))
        {
@@ -5207,7 +5199,7 @@ _VisualElementImpl::ChangeZOrder(_VisualElementImpl& child, const _VisualElement
                        }
                }
        }
-       else
+       else if(IS_RENDER_OBJECT(this))
        {
                if (likely(GetSharedData().pNativeNode) && likely(child.GetSharedData().pNativeNode))
                {
@@ -5275,9 +5267,6 @@ _VisualElementImpl::UpdatePresentationWhenZOrderChanged(const _VisualElementImpl
                __pParent->__pPresentation->ChangeZOrder(*__pPresentation, pReferenceRenderObject, above, _zOrderGroup);
 
        }
-
-
-
 }
 
 void
@@ -5299,8 +5288,6 @@ _VisualElementImpl::UpdatePresentationWhenChildRemoved(_VisualElementImpl& child
        {
                __pPresentation->RemoveChild(*child.GetPresentation(), deallocate);
        }
-
-
 }
 
 result
@@ -5354,7 +5341,7 @@ _VisualElementImpl::RemoveChildWithoutReconfiguring(int indexChild, bool invalid
                        }
                }
        }
-       else
+       else if (IS_RENDER_OBJECT(this))
        {
                if (GetSharedData().pNativeNode && pChild->GetSharedData().pNativeNode)
                {
@@ -5540,6 +5527,49 @@ _VisualElementImpl::RebuildNativeNodeTree(_VisualElementImpl& parent)
                return;
        }
 
+       if (likely(parent.GetNativeNode()))
+       {
+               if (unlikely(GetNativeNode()))
+               {
+                       //change if type is different
+                       if (parent.GetSharedData().__useEfl != GetSharedData().__useEfl)
+                       {
+                               _INativeNode* pOldParentNode = GetParent()->GetSharedData().pNativeNode;
+                               SysAssertf(pOldParentNode, "child has node but there is no parent.");
+                               pOldParentNode->RemoveChild(*GetNativeNode());
+                               GetSharedData().ChangeNativeNode(parent.GetSharedData().__useEfl);
+                               if (__hasColor)
+                               {
+                                       GetNativeNode()->SetBackgroundColor(__color);
+                               }
+                       }
+
+               }
+               else
+               {
+                       // create
+                       GetSharedData().CreateNativeNode(parent.GetSharedData().__useEfl);
+                       if (__hasColor)
+                       {
+                               GetNativeNode()->SetBackgroundColor(__color);
+                       }
+                       
+               }
+       }
+       else
+       {
+               if (unlikely(GetNativeNode()))
+               {
+                       _INativeNode* pOldParentNode = GetParent()->GetSharedData().pNativeNode;
+                       SysAssertf(pOldParentNode, "child has node but there is no parent.");
+                       pOldParentNode->RemoveChild(*GetNativeNode());
+
+                       delete GetSharedData().pNativeNode;
+                       GetSharedData().pNativeNode = null;
+               }
+       }
+
+
        _INativeNode* pNode = GetNativeNode();
        _INativeNode* pParentNode = parent.GetNativeNode();
 
@@ -5548,7 +5578,7 @@ _VisualElementImpl::RebuildNativeNodeTree(_VisualElementImpl& parent)
                return;
        }
 
-       pNode->RebuildIfNeeded(*pParentNode);
+       pNode->Construct(*pParentNode);
 
 //TODO : must check ,don't you need to rebuild???
 //     RebuildCoordinates();
@@ -8523,6 +8553,21 @@ _VisualElementImpl::SetBoundsChangedCallback(BoundsChangedCallback pCallback, vo
 }
 
 result
+_VisualElementImpl::SetNativeNodeColor(const _Colorf& color)
+{
+       __pRenderObject->__hasColor = true;
+       __pRenderObject->__color = color;
+
+       return E_SUCCESS;
+}
+
+_Colorf
+_VisualElementImpl::GetNativeNodeColor(void)
+{
+       return __pRenderObject->__color;
+}
+
+result
 _VisualElementImpl::SetMesh(Mesh* pMesh)
 {
        Mesh* pOldMesh = GetSharedData().geometry.GetMesh();
@@ -9604,20 +9649,5 @@ _VisualElementImpl::InvokeOnBoundsChanged(const FloatRectangle& oldBounds)
        ClearLastResult();
 }
 
-#ifdef ENABLE_VE_EFL
-void
-_VisualElementImpl::ChangeNativeNode(_VisualElementImpl& child)
-{
-       child.GetSharedData().ChangeNativeNode(*(child.__pRenderObject), true);
-
-       int count = child.__children.GetCount();
-       for (int i = 0; i < count; i++)
-       {
-               _VisualElementImpl* pChild = child.__children.GetChildAt(i);
-               ChangeNativeNode(*pChild);
-       }
-}
-#endif
-
 }}}
 

diff --git a/src/ui/animations/FUiAnim_VisualElementSharedData.cpp b/src/ui/animations/FUiAnim_VisualElementSharedData.cpp
index d8516ab..7779470 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementSharedData.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementSharedData.cpp
@@ -1034,11 +1034,8 @@ _VisualElementSharedData::_VisualElementSharedData(_VisualElementImpl* pModel)
        , name(L"")
        , toUpdatePropertiesForRenderObject(pModel)
        , pUserData(null)
-       , __refCount(1)
-#ifdef ENABLE_VE_EFL
        , __useEfl(false)
-#endif
-
+       , __refCount(1)
 {
        memset(extraSurfaceOpacity, 1.0, sizeof(float)*EXTRA_SURFACE_MAX);
        memset(pExtraSurfaceList, null, sizeof(VisualElementSurface* )*EXTRA_SURFACE_MAX);
@@ -1080,8 +1077,8 @@ _VisualElementSharedData::Construct(void)
        ClearLastResult();
        SysAssert(pNativeNode == null);
 
-       pNativeNode = _INativeNode::CreateInstanceN();
-       SysTryReturnResult(NID_UI, pNativeNode, E_OUT_OF_MEMORY, "Memory allocation failed.");
+       //pNativeNode = _INativeNode::CreateInstanceN();
+       //SysTryReturnResult(NID_UI, pNativeNode, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        return E_SUCCESS;
 }
@@ -1180,22 +1177,31 @@ _VisualElementSharedData::RemoveSurface(_VisualElementImpl& presentation)
        pSurface = null;
 }
 
+result
+_VisualElementSharedData::CreateNativeNode(bool useEfl)
+{
+       ClearLastResult();
+
+       pNativeNode = _INativeNode::CreateInstanceN(useEfl);
+       SysTryReturnResult(NID_UI, pNativeNode, E_OUT_OF_MEMORY, "Memory allocation failed.");
+
+       __useEfl = useEfl;
+
+       return E_SUCCESS;
+}
+
 #ifdef ENABLE_VE_EFL
 result
-_VisualElementSharedData::ChangeNativeNode(_VisualElementImpl& presentation, bool reconfigure)
+_VisualElementSharedData::ChangeNativeNode(bool useEfl)
 {
        SysTryReturnResult(NID_UI, pNativeNode, E_INVALID_STATE, "The Native Node is invalid.");
        SysTryReturnResult(NID_UI, pSurface == null, E_INVALID_STATE, "The surface is exist already.");
 
+       //need to remove child?
        delete pNativeNode;
-       pNativeNode = _INativeNode::CreateInstanceN(true);
-
-       if (reconfigure)
-       {
-               pNativeNode->Reconfigure(null, presentation, false);
-       }
+       pNativeNode = _INativeNode::CreateInstanceN(useEfl);
 
-       __useEfl = true;
+       __useEfl = useEfl;
 
        return E_SUCCESS;
 }

diff --git a/src/ui/animations/FUiAnim_VisualElementSurfaceImpl.cpp b/src/ui/animations/FUiAnim_VisualElementSurfaceImpl.cpp
index 279ec75..68bbc5f 100644 (file)
--- a/src/ui/animations/FUiAnim_VisualElementSurfaceImpl.cpp
+++ b/src/ui/animations/FUiAnim_VisualElementSurfaceImpl.cpp
@@ -57,8 +57,7 @@ _VisualElementSurfaceImpl::CreateSurfaceN(const Handle handle, const FloatDimens
 
 #ifdef ENABLE_VE_EFL
        _NativeLayer* pLayer = reinterpret_cast<_NativeLayer*>(handle);
-       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-       if (pEflLayer)
+       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
        {
                unique_ptr<_EflVisualElementSurfaceImpl> pEflImpl(new (std::nothrow) _EflVisualElementSurfaceImpl(handle, size));
                SysTryReturn(NID_UI_ANIM, pEflImpl, null, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument(s) is used. The handle is invalid.");
@@ -86,8 +85,7 @@ _VisualElementSurfaceImpl::CreateDynamicSurfaceN(const Handle handle, const Floa
 
 #ifdef ENABLE_VE_EFL
        _NativeLayer* pLayer = reinterpret_cast<_NativeLayer*>(handle);
-       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-       if (pEflLayer)
+       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
        {
                unique_ptr<_EflVisualElementSurfaceImpl> pEflImpl(new (std::nothrow) _EflVisualElementSurfaceImpl(handle, size));
                SysTryReturn(NID_UI_ANIM, pEflImpl, null, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument(s) is used. The handle is invalid.");
@@ -120,10 +118,9 @@ _VisualElementSurfaceImpl::CreateSurfaceUsingExistingObjectN(const DisplayContex
        SysTryReturn(NID_UI_ANIM, pLayer != null, null, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument(s) is used. DisplayContext is invalid.");
 
 #ifdef ENABLE_VE_EFL
-       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-       if (pEflLayer)
+       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
        {
-               unique_ptr<_EflVisualElementSurfaceImpl> pEflImpl(new (std::nothrow) _EflVisualElementSurfaceImpl(reinterpret_cast<Handle>(pEflLayer), handle, size));
+               unique_ptr<_EflVisualElementSurfaceImpl> pEflImpl(new (std::nothrow) _EflVisualElementSurfaceImpl(reinterpret_cast<Handle>(pLayer), handle, size));
                SysTryReturn(NID_UI_ANIM, pEflImpl, null, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument(s) is used. The handle is invalid.");
                
                result r = GetLastResult();
@@ -165,8 +162,7 @@ _VisualElementSurfaceImpl::CreateInstanceN(const DisplayContext& displayContext,
        _VisualElementSurfaceImpl* pVisualElementSurfaceImpl = null;
 
 #ifdef ENABLE_VE_EFL
-       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-       if (pEflLayer)
+       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
        {
                pVisualElementSurfaceImpl = new (std::nothrow) _EflVisualElementSurfaceImpl(reinterpret_cast<Handle>(pLayer), size);
        }
@@ -202,8 +198,7 @@ _VisualElementSurfaceImpl::CreateInstanceN(const DisplayContext& displayContext,
        SysTryReturn(NID_UI_ANIM, pLayer != null, null, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument(s) is used. DisplayContext is invalid.");
 
 #ifdef ENABLE_VE_EFL
-       _EflLayer* pEflLayer = dynamic_cast<_EflLayer*>(pLayer);
-       if (pEflLayer)
+       if (pLayer->GetLayerType() == _LAYER_TYPE_EFL)
        {
                return null;
        }

diff --git a/src/ui/inc/FUiAnim_EflNode.h b/src/ui/inc/FUiAnim_EflNode.h
index 108d290..8b0b615 100644 (file)
--- a/src/ui/inc/FUiAnim_EflNode.h
+++ b/src/ui/inc/FUiAnim_EflNode.h
@@ -30,7 +30,6 @@
 #include <FUiAnimVisualElement.h>
 #include <FUiAnimVisualElementSurface.h>
 
-#include "FUi_Colorf.h"
 #include "FUiAnim_INativeNode.h"
 
 
@@ -49,8 +48,8 @@ public:
        _EflNode(void);
        virtual ~_EflNode(void);
 
-       virtual result Construct(void);
-       virtual result RebuildIfNeeded(const _INativeNode& parent);
+       virtual result Construct(const _INativeNode& parent);
+       result Construct(const _NativeLayer& layer);
 
 public:
        virtual Handle GetGroupContainer(void) const;
@@ -61,10 +60,10 @@ public:
        virtual result Reconfigure(VisualElementSurface* pSurface, _VisualElementImpl& element, bool surfaceOnly);
        virtual VisualElementSurface* GetSurface(void) const;
 
-       Evas* GetEvas(void) const;
+       virtual _Colorf GetBackgroundColor(void) const;
+       virtual result SetBackgroundColor(const _Colorf& backgroundColor);
 
-       _Colorf GetBackgroundColor(void) const;
-       result SetBackgroundColor(const _Colorf& backgroundColor);
+       Evas* GetEvas(void) const;
 
        void AddNativeSmartObject(VisualElement& element, Evas_Object* pSmartObject);
        void SetNativeObject(VisualElement& element, Evas_Object* pNativeObject);
@@ -75,10 +74,10 @@ private:
        void AdjustEvasObjectOrder(void);
        bool AdjustImageHolder(bool useHolder);
 
-       result ReConstruct(const Evas* pEvas);
-       result ReConstruct(const _NativeLayer& layer);
+       //result ReConstruct(const Evas* pEvas);
+       //result ReConstruct(const _NativeLayer& layer);
 
-       result Destruct(void);
+       //result Destruct(void);
 
 private:
        _EflNode(const _EflNode& rhs);              // no impl.
@@ -109,7 +108,6 @@ private:
        friend class _INativeNode;
        friend class _VeDebug;
        friend class _VisualElementImpl;
-       friend class _EflLayer;
 };             // _EflNode
 
 

diff --git a/src/ui/inc/FUiAnim_INativeNode.h b/src/ui/inc/FUiAnim_INativeNode.h
index 3961c94..fe9e888 100644 (file)
--- a/src/ui/inc/FUiAnim_INativeNode.h
+++ b/src/ui/inc/FUiAnim_INativeNode.h
@@ -27,6 +27,8 @@
 
 #include <FGrpFloatRectangle.h>
 
+#include "FUi_Colorf.h"
+
 namespace Tizen { namespace Ui { namespace Animations
 {
 
@@ -43,8 +45,7 @@ public:
        //ENABLE_VE_EFL
        static _INativeNode* CreateInstanceN(bool useEfl=false);
 
-       virtual result Construct(void) = 0;
-       virtual result RebuildIfNeeded(const _INativeNode& parent) = 0;
+       virtual result Construct(const _INativeNode& parent) = 0;
 
 public:
        virtual result InsertChild(_INativeNode& child, const _INativeNode* pReference, bool above) = 0;
@@ -54,6 +55,9 @@ public:
        virtual result Reconfigure(VisualElementSurface* pSurface, _VisualElementImpl& element, bool surfaceOnly) = 0;
        virtual VisualElementSurface* GetSurface(void) const = 0;
 
+       virtual _Colorf GetBackgroundColor(void) const = 0;
+       virtual result SetBackgroundColor(const _Colorf& backgroundColor) = 0;
+
 private:
        _INativeNode(const _INativeNode& rhs);              // no impl.
        _INativeNode& operator =(const _INativeNode& rhs);  // no impl.

diff --git a/src/ui/inc/FUiAnim_NativeLayer.h b/src/ui/inc/FUiAnim_NativeLayer.h
index ec14a98..78f07f7 100644 (file)
--- a/src/ui/inc/FUiAnim_NativeLayer.h
+++ b/src/ui/inc/FUiAnim_NativeLayer.h
@@ -40,6 +40,12 @@ class _RootVisualElement;
 class _INativeNode;
 class _NativeWindow;
 
+enum _LayerType
+{
+       _LAYER_TYPE_GL,
+       _LAYER_TYPE_EFL
+};
+
 class _OSP_EXPORT_ _NativeLayer : public Tizen::Base::Object
 {
 public:
@@ -205,6 +211,14 @@ public:
         */
        virtual void Flush(void) = 0;
 
+       /**
+        * Gets the type of this instance.
+        *
+        * @since 3.0
+        * @return              the type of Layer
+        */
+       _LayerType GetLayerType(void) const;
+
 protected:
 
        virtual result OnConstructed(void) = 0;
@@ -258,6 +272,7 @@ private:
 //     bool __needUpdateRenderObjects;
 //    bool __didSyncPresentation;
 
+       _LayerType __type;
 
        friend class _RootVisualElement;
 

diff --git a/src/ui/inc/FUiAnim_VisualElementImpl.h b/src/ui/inc/FUiAnim_VisualElementImpl.h
index 27285b6..0128713 100644 (file)
--- a/src/ui/inc/FUiAnim_VisualElementImpl.h
+++ b/src/ui/inc/FUiAnim_VisualElementImpl.h
@@ -831,6 +831,9 @@ protected:
 //     virtual _VisualElementImpl* CloneN(void);
        void InvalidateHierarchyProps(PropertyFlags invalidProps, bool broadcastToChildren, bool propagateToParentsOnly);
 
+       result SetNativeNodeColor(const _Colorf& color);
+       _Colorf GetNativeNodeColor(void);
+
 private:
 
 
@@ -1335,10 +1338,6 @@ private:
        Tizen::Base::Collection::IList* GetChildListAtN(const Tizen::Graphics::FloatRectangle& selection, VisualElement::SelectionMode mode);
        result GetSelectedI(const Tizen::Ui::Animations::_Selection& selection, VisualElement::SelectionMode mode, Tizen::Base::Collection::IList& list);
 
-#ifdef ENABLE_VE_EFL
-       void ChangeNativeNode(_VisualElementImpl& child);
-#endif
-
 public:
        enum
        {
@@ -1516,6 +1515,9 @@ private:
 
        _IVisualElementCaptureProvider* __pCaptureProvider;
 
+       bool __hasColor;
+       _Colorf __color;
+
        friend class _VeDebug;
        friend class VisualElement;
        friend class _VisualElement;

diff --git a/src/ui/inc/FUiAnim_VisualElementSharedData.h b/src/ui/inc/FUiAnim_VisualElementSharedData.h
index 661c1cf..e88de4e 100644 (file)
--- a/src/ui/inc/FUiAnim_VisualElementSharedData.h
+++ b/src/ui/inc/FUiAnim_VisualElementSharedData.h
@@ -77,9 +77,9 @@ public:
                return (invalidatedNativeProps != 0) || surfaceChanged || geometry.IsUpdated();
        }
 
-#ifdef ENABLE_VE_EFL
-       result ChangeNativeNode(_VisualElementImpl& presentation, bool reconfigure);
-#endif
+       result CreateNativeNode(bool useEfl);
+       
+       result ChangeNativeNode(bool useEfl);
 
 public:
        int invalidatedNativeProps;
@@ -104,6 +104,8 @@ public:
 
        Tizen::Base::String name;
 
+       bool __useEfl;
+
        class UpdatePropertiesForRender
        {
        public:
@@ -238,11 +240,6 @@ private:
 
 private:
        int __refCount;
-
-#ifdef ENABLE_VE_EFL
-public:
-       bool __useEfl;
-#endif
        
 };             // _VisualElementSharedData