Revert "remove repetition code in SetZOrderGroupI api"
authorDaeYoung Ryu <karzia@samsung.com>
Mon, 23 Sep 2013 05:21:43 +0000 (05:21 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Mon, 23 Sep 2013 05:21:43 +0000 (05:21 +0000)
This reverts commit 57bb0011846625dca4ed46377d1ccb0d72fb8952.

Change-Id: I7371e160d3935fd47bab40108e0b08363c0f28f4

src/ui/animations/FUiAnim_VisualElementImpl.cpp

index 1eaeca4..a2739da 100644 (file)
@@ -1472,21 +1472,12 @@ _VisualElementImpl::SetZOrderGroupI(int zOrderGroup)
        else
        {
                _zOrderGroup = zOrderGroup;
-
-               if(likely(__pPresentation))
-               {
-                       __pPresentation->_zOrderGroup = zOrderGroup;
-               }
        }
 
-//     if(IS_MODEL(this) && IS_NEEDED_UPDATE_PRESENTATION(this))
-//     {
-//             //__pPresentation->SetZOrderGroupProperty(_zOrderGroup);
-//             if(likely(__pPresentation))
-//             {
-//                     __pPresentation->_zOrderGroup = zOrderGroup;
-//             }
-//     }
+       if(IS_MODEL(this) && IS_NEEDED_UPDATE_PRESENTATION(this))
+       {
+               __pPresentation->SetZOrderGroupProperty(_zOrderGroup);
+       }
        return r;
 }
 
@@ -6902,7 +6893,7 @@ _VisualElementImpl::CheckIfAnimatable(const String& property) const
 
        for (int i = 0; i < static_cast< int >(sizeof(supportedProperties) / sizeof(supportedProperties[0])); i++)
        {
-
+               //if (wcscmp(property.GetPointer(), supportedProperties[i]) == 0)
                if (property.GetPointer() == (*supportedProperties[i])->GetPointer() || property == **supportedProperties[i])
                {
                        return true;
@@ -6920,6 +6911,38 @@ _VisualElementImpl::CreateAnimationForPropertyI(const Tizen::Base::String& prope
                return null;
        }
 
+#if 0
+       if (property.CompareTo(String(VePropBounds)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropOpacity)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropChildrenOpacity)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropShowState)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropTransform)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropChildrenTransform)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else if (property.CompareTo(String(VePropZPosition)) == 0)
+       {
+               //ToDo: default implementation
+       }
+       else
+               return null;
+#endif
        VisualElementPropertyAnimation* pAnimation = new (std::nothrow) VisualElementPropertyAnimation();
        SysTryReturn(NID_UI_ANIM, pAnimation != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");