Remove obsolete and non functional SizeChanged signal from actor

Change-Id: I71e9017b484d645ae85040f131bfa627e9601823

diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp
index 758765f..a969377 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Actor.cpp
+++ b/automated-tests/src/dali/utc-Dali-Actor.cpp
@@ -2290,46 +2290,6 @@ int UtcDaliActorHoveredSignal(void)
   END_TEST;
 }
 
-int UtcDaliActorSetSizeSignal(void)
-{
-  TestApplication application;
-
-  Actor actor = Actor::New();
-  actor.SetSizeSignal().Connect( SetSizeCallback );
-
-  gSetSize.x = gSetSize.y = gSetSize.z = 0.0f;
-  gSetSizeCallBackCalled = false;
-  Vector2 size2d( 1.0f, 2.0f );
-  actor.SetSize( size2d );
-  DALI_TEST_CHECK( gSetSizeCallBackCalled == true );
-  // SetSize with Vector2 sets depth to be the minimum of width & height
-  DALI_TEST_EQUALS( Vector3( 1.0f, 2.0f, 1.0f ), gSetSize,  TEST_LOCATION );
-
-  gSetSize.x = gSetSize.y = gSetSize.z = 0.0f;
-  gSetSizeCallBackCalled = false;
-  actor.SetSize( 22.0f, 11.0f );
-  DALI_TEST_CHECK( gSetSizeCallBackCalled == true );
-  // SetSize with Vector2 sets depth to be the minimum of width & height
-  DALI_TEST_EQUALS( Vector3( 22.0f, 11.0f, 11.0f ), gSetSize,  TEST_LOCATION );
-
-  gSetSize.x = gSetSize.y = gSetSize.z = 0.0f;
-  gSetSizeCallBackCalled = false;
-  Vector3 size( 3.0f, 4.0f, 5.0f );
-  actor.SetSize( size );
-  DALI_TEST_CHECK( gSetSizeCallBackCalled == true );
-  DALI_TEST_EQUALS( size, gSetSize,  TEST_LOCATION );
-
-  // add actor to stage to see that signal still works
-  Stage::GetCurrent().Add( actor );
-
-  gSetSize.x = gSetSize.y = gSetSize.z = 0.0f;
-  gSetSizeCallBackCalled = false;
-  actor.SetSize( -1.0f, -2.0f, -3.0f );
-  DALI_TEST_CHECK( gSetSizeCallBackCalled == true );
-  DALI_TEST_EQUALS( Vector3( -1.0f, -2.0f, -3.0f ), gSetSize,  TEST_LOCATION );
-  END_TEST;
-}
-
 int UtcDaliActorOnOffStageSignal(void)
 {
   tet_infoline("Testing Dali::Actor::OnStageSignal() and OffStageSignal()");

diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp
index 1d3aa68..e0ee55b 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Scripting.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp
@@ -610,7 +610,6 @@ int UtcDaliScriptingNewActorNegative(void)
     DALI_TEST_CHECK( !handle.MouseWheelEventSignal().GetConnectionCount() );
     DALI_TEST_CHECK( !handle.OffStageSignal().GetConnectionCount() );
     DALI_TEST_CHECK( !handle.OnStageSignal().GetConnectionCount() );
-    DALI_TEST_CHECK( !handle.SetSizeSignal().GetConnectionCount() );
     DALI_TEST_CHECK( !handle.TouchedSignal().GetConnectionCount() );
   }
   END_TEST;

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index 0c5f138..625f84a 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -207,7 +207,6 @@ TypeRegistration mType( typeid(Dali::Actor), typeid(Dali::Handle), CreateActor )
 
 SignalConnectorType signalConnector1(mType, Dali::Actor::SIGNAL_TOUCHED,    &Actor::DoConnectSignal);
 SignalConnectorType signalConnector2(mType, Dali::Actor::SIGNAL_HOVERED,    &Actor::DoConnectSignal);
-SignalConnectorType signalConnector3(mType, Dali::Actor::SIGNAL_SET_SIZE,   &Actor::DoConnectSignal);
 SignalConnectorType signalConnector4(mType, Dali::Actor::SIGNAL_ON_STAGE,   &Actor::DoConnectSignal);
 SignalConnectorType signalConnector5(mType, Dali::Actor::SIGNAL_OFF_STAGE,  &Actor::DoConnectSignal);
 
@@ -1106,14 +1105,6 @@ void Actor::SetSize(const Vector3& size)
 
     // Notification for derived classes
     OnSizeSet( mSize );
-
-    // Emit signal for application developer
-
-    if( !mSetSizeSignal.Empty() )
-    {
-      Dali::Actor handle( this );
-      mSetSizeSignal.Emit( handle, mSize );
-    }
   }
 }
 
@@ -1965,11 +1956,6 @@ Dali::Actor::MouseWheelEventSignalType& Actor::MouseWheelEventSignal()
   return mMouseWheelEventSignal;
 }
 
-Dali::Actor::SetSizeSignalType& Actor::SetSizeSignal()
-{
-  return mSetSizeSignal;
-}
-
 Dali::Actor::OnStageSignalType& Actor::OnStageSignal()
 {
   return mOnStageSignal;
@@ -1997,10 +1983,6 @@ bool Actor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
   {
     actor->MouseWheelEventSignal().Connect( tracker, functor );
   }
-  else if(Dali::Actor::SIGNAL_SET_SIZE == signalName)
-  {
-    actor->SetSizeSignal().Connect( tracker, functor );
-  }
   else if(Dali::Actor::SIGNAL_ON_STAGE == signalName)
   {
     actor->OnStageSignal().Connect( tracker, functor );

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 50c58fb..2b8f748 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -999,11 +999,6 @@ public:
   Dali::Actor::MouseWheelEventSignalType& MouseWheelEventSignal();
 
   /**
-   * @copydoc Dali::Actor::SetSizeSignal()
-   */
-  Dali::Actor::SetSizeSignalType& SetSizeSignal();
-
-  /**
    * @copydoc Dali::Actor::OnStageSignal()
    */
   Dali::Actor::OnStageSignalType& OnStageSignal();
@@ -1358,7 +1353,6 @@ protected:
   Dali::Actor::TouchSignalType             mTouchedSignal;
   Dali::Actor::HoverSignalType             mHoveredSignal;
   Dali::Actor::MouseWheelEventSignalType   mMouseWheelEventSignal;
-  Dali::Actor::SetSizeSignalType           mSetSizeSignal;
   Dali::Actor::OnStageSignalType           mOnStageSignal;
   Dali::Actor::OffStageSignalType          mOffStageSignal;
 

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index b76f941..d8b36bb 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -49,7 +49,6 @@ namespace Dali
 const char* const Actor::SIGNAL_TOUCHED = "touched";
 const char* const Actor::SIGNAL_HOVERED = "hovered";
 const char* const Actor::SIGNAL_MOUSE_WHEEL_EVENT = "mouse-wheel-event";
-const char* const Actor::SIGNAL_SET_SIZE = "set-size";
 const char* const Actor::SIGNAL_ON_STAGE = "on-stage";
 const char* const Actor::SIGNAL_OFF_STAGE = "off-stage";
 
@@ -497,11 +496,6 @@ Actor::MouseWheelEventSignalType& Actor::MouseWheelEventSignal()
   return GetImplementation(*this).MouseWheelEventSignal();
 }
 
-Actor::SetSizeSignalType& Actor::SetSizeSignal()
-{
-  return GetImplementation(*this).SetSizeSignal();
-}
-
 Actor::OnStageSignalType& Actor::OnStageSignal()
 {
   return GetImplementation(*this).OnStageSignal();

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index d159f15..df6a21e 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -237,7 +237,6 @@ public:
   typedef Signal< bool (Actor, const TouchEvent&)> TouchSignalType;                ///< Touch signal type
   typedef Signal< bool (Actor, const HoverEvent&)> HoverSignalType;                ///< Hover signal type
   typedef Signal< bool (Actor, const MouseWheelEvent&) > MouseWheelEventSignalType;///< Mousewheel signal type
-  typedef Signal< void (Actor, const Vector3&) > SetSizeSignalType; ///< SetSize signal type
   typedef Signal< void (Actor) > OnStageSignalType;  ///< Stage connection signal type
   typedef Signal< void (Actor) > OffStageSignalType; ///< Stage disconnection signal type
 
@@ -293,7 +292,6 @@ public:
   static const char* const SIGNAL_TOUCHED;            ///< name "touched",           @see TouchedSignal()
   static const char* const SIGNAL_HOVERED;            ///< name "hovered",           @see HoveredSignal()
   static const char* const SIGNAL_MOUSE_WHEEL_EVENT;  ///< name "mouse-wheel-event", @see MouseWheelEventSignal()
-  static const char* const SIGNAL_SET_SIZE;           ///< name "set-size",          @see SetSizeSignal()
   static const char* const SIGNAL_ON_STAGE;           ///< name "on-stage",          @see OnStageSignal()
   static const char* const SIGNAL_OFF_STAGE;          ///< name "off-stage",         @see OffStageSignal()
   /** @} */
@@ -1201,21 +1199,6 @@ public: // Signals
   MouseWheelEventSignalType& MouseWheelEventSignal();
 
   /**
-   * @brief Signal to indicate when the actor's size is set by application code.
-   *
-   * This signal is emitted when actors size is being <b>set</b> by application code.
-   * This signal is <b>not</b> emitted when size is animated
-   * Note! GetCurrentSize might not return this same size as the set size message may still be queued
-   * A callback of the following type may be connected:
-   * @code
-   *   void YourCallback(Actor actor, const Vector3& newSize);
-   * @endcode
-   * @pre The Actor has been initialized.
-   * @return The signal to connect to.
-   */
-  SetSizeSignalType& SetSizeSignal();
-
-  /**
    * @brief This signal is emitted after the actor has been connected to the stage.
    *
    * When an actor is connected, it will be directly or indirectly parented to the root Actor.

diff --git a/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h
index 1311398..357fc33 100644 (file)
--- a/dali/public-api/actors/image-actor.h
+++ b/dali/public-api/actors/image-actor.h
@@ -248,7 +248,6 @@ public:
    *
    * @post The image actor uses the natural image size after an image
    * has been loaded.
-   * @note Actor::SetSizeSignal() will be triggered if there is a current image.
    */
   void SetToNaturalSize();