Merge "Removed REQUIRES_STYLE_CHANGE_SIGNALS" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 3 Sep 2020 19:35:37 +0000 (19:35 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 3 Sep 2020 19:35:37 +0000 (19:35 +0000)
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h

index 5390b5c..e60505d 100644 (file)
@@ -127,7 +127,7 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper
   {
     Control::OnChildRemove(child);
   }
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue )
+  virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue )
   {
     Control::OnPropertySet(index, propertyValue);
   }
index 48718b3..d40cd76 100755 (executable)
@@ -927,7 +927,7 @@ float TextLabel::GetHeightForWidth( float width )
   return mController->GetHeightForWidth( width ) + padding.top + padding.bottom;
 }
 
-void TextLabel::OnPropertySet( Property::Index index, Property::Value propertyValue )
+void TextLabel::OnPropertySet( Property::Index index, const Property::Value& propertyValue )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextLabel::OnPropertySet index[%d]\n", index );
 
index 85e94ab..17bf6e5 100644 (file)
@@ -103,7 +103,7 @@ private: // From Control
   /**
    * @copydoc Control::OnPropertySet()
    */
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override ;
+  void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override ;
 
   // From ControlInterface
 
index 41c1274..5224db1 100644 (file)
@@ -595,7 +595,7 @@ void Control::OnChildRemove(Actor& child)
 {
 }
 
-void Control::OnPropertySet( Property::Index index, Property::Value propertyValue )
+void Control::OnPropertySet( Property::Index index, const Property::Value& propertyValue )
 {
   // If the clipping mode has been set, we may need to create a renderer.
   // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls.
index 611659e..74117e9 100644 (file)
@@ -324,7 +324,7 @@ protected: // From CustomActorImpl
    * @copydoc CustomActorImpl::OnPropertySet()
    * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end.
    */
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override;
+  void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override;
 
   /**
    * @copydoc CustomActorImpl::OnSizeSet()