add ELM_WIN_UTILITY type

Change-Id: Ia78dbaf052943f32c1d00bea556b864d55e3403d
Signed-off-by: Dae young Ryu <karzia@samsung.com>

diff --git a/src/ui/animations/FUiAnim_EflLayer.cpp b/src/ui/animations/FUiAnim_EflLayer.cpp
index 819a6a5..7311a8c 100644 (file)
--- a/src/ui/animations/FUiAnim_EflLayer.cpp
+++ b/src/ui/animations/FUiAnim_EflLayer.cpp
@@ -270,10 +270,29 @@ _EflLayer::_EflLayer(void)
        , _isShow(false)
        , _isVisibilityChangeInProgress(false)
        , _needAsyncVisibilityChangeRequest(true)
+       , _isMainType(true)
 {
        _countOfLayer++;
 }
 
+_EflLayer::_EflLayer(bool isMainType)
+       : _pRootVisualElement(null)
+       , _pEvas(null)
+       , _pEcoreEvas(null)
+       , _pWindow(null)
+       , _pOnWindowDamagedHandler(null)
+       , _pOnWindowConfiguredHandler(null)
+       , _pOnWindowHideHandler(null)
+       , _pOnWindowShowHandler(null)
+       , _needEvasRender(0)
+       , _needShowStateChangeRequest(false)
+       , _isShow(false)
+       , _isVisibilityChangeInProgress(false)
+       , _needAsyncVisibilityChangeRequest(true)
+       , _isMainType(isMainType)
+{
+       _countOfLayer++;
+}
 
 _EflLayer::~_EflLayer(void)
 {
@@ -341,7 +360,14 @@ _EflLayer::OnConstructed(void)
                return E_OBJ_ALREADY_EXIST;
        }
 
-       _pWindow = elm_win_add(NULL, NULL, ELM_WIN_BASIC);
+       if(_isMainType)
+       {
+               _pWindow = elm_win_add(NULL, NULL, ELM_WIN_BASIC);
+       }
+       else
+       {
+               _pWindow = elm_win_add(NULL, NULL, ELM_WIN_UTILITY);
+       }
 
        SysTryReturnResult(NID_UI, _pWindow, E_SYSTEM, "A system error has been occurred.");
 

diff --git a/src/ui/animations/FUiAnim_NativeLayer.cpp b/src/ui/animations/FUiAnim_NativeLayer.cpp
index 238e1b1..8031ce8 100644 (file)
--- a/src/ui/animations/FUiAnim_NativeLayer.cpp
+++ b/src/ui/animations/FUiAnim_NativeLayer.cpp
@@ -54,6 +54,25 @@ _NativeLayer::~_NativeLayer(void)
 }
 
 _NativeLayer*
+_NativeLayer::CreateInstanceN(bool isMainType)
+{
+#if defined(VE_EFL)
+       _EflLayer* pLayer = new (std::nothrow) _EflLayer(isMainType);
+
+       if (pLayer)
+       {
+               pLayer->Construct();
+       }
+       return pLayer;
+
+#else ////#elif defined(VE_OPENGL)
+
+       return null;
+
+#endif
+}
+
+_NativeLayer*
 _NativeLayer::CreateInstanceN(void)
 {
 #if defined(VE_EFL)

diff --git a/src/ui/inc/FUiAnim_EflLayer.h b/src/ui/inc/FUiAnim_EflLayer.h
index 08a4615..3aaf65c 100644 (file)
--- a/src/ui/inc/FUiAnim_EflLayer.h
+++ b/src/ui/inc/FUiAnim_EflLayer.h
@@ -43,6 +43,7 @@ class _OSP_EXPORT_ _EflLayer
 {
 public:
        _EflLayer(void);
+       _EflLayer(bool isMainType);
        virtual ~_EflLayer(void);
 
        virtual result OnConstructed(void);
@@ -114,6 +115,7 @@ protected:
        bool _isShow;
        bool _isVisibilityChangeInProgress;
        bool _needAsyncVisibilityChangeRequest;
+       bool _isMainType;
 
        static int _countOfLayer;
 };

diff --git a/src/ui/inc/FUiAnim_NativeLayer.h b/src/ui/inc/FUiAnim_NativeLayer.h
index de9c337..f26b62c 100644 (file)
--- a/src/ui/inc/FUiAnim_NativeLayer.h
+++ b/src/ui/inc/FUiAnim_NativeLayer.h
@@ -53,6 +53,14 @@ public:
         */
        static _NativeLayer* CreateInstanceN(void);
 
+       /**
+        * Factory method of the native layer.
+        *
+        * @since 2.0
+        * @return              instance of the native layer.
+        * @remarks     This method make a instance of native layer by configuration.And call the Construct() method.
+        */
+       static _NativeLayer* CreateInstanceN(bool isMainType);
 public:
        /**
         * Initializes the native layer. It is designed with 2 phase-construction.