From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 3 Sep 2020 19:35:37 +0000 (+0000)
Subject: Merge "Removed REQUIRES_STYLE_CHANGE_SIGNALS" into devel/master
X-Git-Tag: dali_1.9.28~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a7c4e86e15b7eef5b0d50b12f6da4b1c650b8c33;hp=-c

Merge "Removed REQUIRES_STYLE_CHANGE_SIGNALS" into devel/master
---

a7c4e86e15b7eef5b0d50b12f6da4b1c650b8c33
diff --combined dali-toolkit/public-api/controls/control-impl.cpp
index feccaeb,41c1274..5224db1
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@@ -461,8 -461,7 +461,7 @@@ void Control::Initialize(
    // Call deriving classes so initialised before styling is applied to them.
    OnInitialize();
  
-   if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) ||
-       !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) )
+   if( !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) )
    {
      Toolkit::StyleManager styleManager = StyleManager::Get();
  
@@@ -596,7 -595,7 +595,7 @@@ void Control::OnChildRemove(Actor& chil
  {
  }
  
 -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.
diff --combined dali-toolkit/public-api/controls/control-impl.h
index db7d997,611659e..74117e9
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@@ -324,7 -324,7 +324,7 @@@ protected: // From CustomActorImp
     * @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()
@@@ -394,10 -394,10 +394,10 @@@ protected: // Helpers for deriving clas
    enum ControlBehaviour
    {
      CONTROL_BEHAVIOUR_DEFAULT            = 0, ///< Default behaviour: Size negotiation is enabled & listens to Style Change signal, but doesn't receive event callbacks. @SINCE_1_2_10
-     REQUIRES_STYLE_CHANGE_SIGNALS        = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ),     ///< True if needs to monitor style change signals such as theme/font change @SINCE_1_0.0 @DEPRECATED_1_2_10
-     REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ),     ///< True if needs to support keyboard navigation @SINCE_1_0.0
  
-     DISABLE_STYLE_CHANGE_SIGNALS         = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 2 ),     ///< True if control should not monitor style change signals @SINCE_1_2_10
+     REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ),     ///< True if needs to support keyboard navigation @SINCE_1_0.0
+ 
+     DISABLE_STYLE_CHANGE_SIGNALS         = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ),     ///< True if control should not monitor style change signals @SINCE_1_2_10
  
      LAST_CONTROL_BEHAVIOUR_FLAG
    };