Revert "[Tizen] Merge shadow code from devel/master"

This reverts commit 9a1e1beefe823f8b7810aa1857d21e35cfc5fb40.

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index bd15bb0..2692fd1 100755 (executable)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -616,42 +616,6 @@ int UtcDaliControlBackgroundProperties(void)
   END_TEST;
 }
 
-int UtcDaliControlShadowProperties(void)
-{
-  ToolkitTestApplication application;
-  Control control = Control::New();
-
-  DALI_TEST_CHECK( control.GetProperty( DevelControl::Property::SHADOW ).Get< Property::Map >().Empty() );
-
-  Property::Map imageMap;
-  imageMap[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
-  imageMap[ ImageVisual::Property::URL ] = "TestImage";
-  control.SetProperty( DevelControl::Property::SHADOW, imageMap );
-  Property::Value propValue = control.GetProperty( DevelControl::Property::SHADOW );
-  Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(),(int)Visual::IMAGE, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ImageVisual::Property::URL ) );
-  DALI_TEST_EQUALS( resultMap->Find( ImageVisual::Property::URL )->Get<std::string>(), "TestImage", TEST_LOCATION );
-
-  Property::Map colorMap;
-  colorMap[Visual::Property::TYPE] = Visual::COLOR;
-  colorMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
-  control.SetProperty( DevelControl::Property::SHADOW, colorMap );
-  propValue = control.GetProperty( DevelControl::Property::SHADOW );
-  resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( Toolkit::Visual::Property::TYPE ) );
-  DALI_TEST_EQUALS( resultMap->Find( Toolkit::Visual::Property::TYPE )->Get<int>(), (int)Visual::COLOR, TEST_LOCATION );
-  DALI_TEST_CHECK( resultMap->Find( ColorVisual::Property::MIX_COLOR ) );
-  DALI_TEST_EQUALS( resultMap->Find( ColorVisual::Property::MIX_COLOR )->Get<Vector4>(), Color::CYAN, TEST_LOCATION );
-
-  Property::Map emptyMap;
-  control.SetProperty( DevelControl::Property::SHADOW, emptyMap );
-  DALI_TEST_CHECK( control.GetProperty( DevelControl::Property::SHADOW ).Get< Property::Map >().Empty() );
-
-  END_TEST;
-}
-
 int UtcDaliControlKeyProperties(void)
 {
   ToolkitTestApplication application;

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index 04e8205..eb2bcda 100755 (executable)
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -115,13 +115,7 @@ enum
    * @details Name "downFocusableActorId", type Property::INTEGER.
    *
    */
-  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7,
-
-  /**
-   * @brief The shadow of the control.
-   * @details Name "shadow", type Property::MAP.
-   */
-  SHADOW = PADDING + 8
+  DOWN_FOCUSABLE_ACTOR_ID = PADDING + 7
 };
 
 } // namespace Property

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index d1e40be..72fd212 100755 (executable)
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -311,7 +311,6 @@ const PropertyRegistration Control::Impl::PROPERTY_11( typeRegistration, "leftFo
 const PropertyRegistration Control::Impl::PROPERTY_12( typeRegistration, "rightFocusableActorId", Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID,Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 const PropertyRegistration Control::Impl::PROPERTY_13( typeRegistration, "upFocusableActorId",    Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID,   Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 const PropertyRegistration Control::Impl::PROPERTY_14( typeRegistration, "downFocusableActorId",  Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty );
-const PropertyRegistration Control::Impl::PROPERTY_15( typeRegistration, "shadow",                Toolkit::DevelControl::Property::SHADOW,                  Property::MAP,     &Control::Impl::SetProperty, &Control::Impl::GetProperty );
 
 Control::Impl::Impl( Control& controlImpl )
 : mControlImpl( controlImpl ),
@@ -986,21 +985,6 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons
         break;
       }
 
-      case Toolkit::DevelControl::Property::SHADOW:
-      {
-        const Property::Map* map = value.GetMap();
-        if( map && !map->Empty() )
-        {
-          controlImpl.mImpl->SetShadow( *map );
-        }
-        else
-        {
-          // The shadow is an empty property map, so we should clear the shadow
-          controlImpl.mImpl->ClearShadow();
-        }
-        break;
-      }
-
     }
   }
 }
@@ -1100,19 +1084,6 @@ Property::Value Control::Impl::GetProperty( BaseObject* object, Property::Index
         value = map;
         break;
       }
-
-      case Toolkit::DevelControl::Property::SHADOW:
-      {
-        Property::Map map;
-        Toolkit::Visual::Base visual = controlImpl.mImpl->GetVisual( Toolkit::DevelControl::Property::SHADOW );
-        if( visual )
-        {
-          visual.CreatePropertyMap( map );
-        }
-
-        value = map;
-        break;
-      }
     }
   }
 
@@ -1461,27 +1432,6 @@ Toolkit::AutofillContainer Control::Impl::GetAutofillContainer()
   return mAutofillContainer;
 }
 
-void Control::Impl::SetShadow( const Property::Map& map )
-{
-  Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map );
-  visual.SetName("shadow");
-
-  if( visual )
-  {
-    mControlImpl.mImpl->RegisterVisual( Toolkit::DevelControl::Property::SHADOW, visual, DepthIndex::BACKGROUND_EFFECT );
-
-    mControlImpl.RelayoutRequest();
-  }
-}
-
-void Control::Impl::ClearShadow()
-{
-   mControlImpl.mImpl->UnregisterVisual( Toolkit::DevelControl::Property::SHADOW );
-
-   // Trigger a size negotiation request that may be needed when unregistering a visual.
-   mControlImpl.RelayoutRequest();
-}
-
 } // namespace Internal
 
 } // namespace Toolkit

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index 487d896..561460f 100755 (executable)
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -375,17 +375,6 @@ public:
    */
   Toolkit::AutofillContainer GetAutofillContainer();
 
-  /**
-   * @brief Sets the shadow with a property map.
-   * @param[in] map The shadow property map
-   */
-  void SetShadow(const Property::Map& map);
-
-  /**
-   * @brief Clear the shadow.
-   */
-  void ClearShadow();
-
 private:
 
   /**
@@ -484,7 +473,6 @@ public:
   static const PropertyRegistration PROPERTY_12;
   static const PropertyRegistration PROPERTY_13;
   static const PropertyRegistration PROPERTY_14;
-  static const PropertyRegistration PROPERTY_15;
 };