[Tizen] fix visual artifact of Transition

This reverts commit 3059eb69f466ca924740bd4b94628bc4230c75db.

Change-Id: Idd70b4ea7c6129e36af6164fa85ca6c4620ff4e6

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index c4b5b856c96aa8ef9ca4b52c0c609b5315025e27..b6964cb5a5097f994bd3ee5ddbbc24adb66267f2 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1241,12 +1241,12 @@ public:
   /**
    * @brief Set this Actor is transparent or not without any affection on the child Actors.
    */
-  virtual void SetTransparent(bool transparent);
+  void SetTransparent(bool transparent);
 
   /**
    * @brief Get this Actor is transparent or not.
    */
-  virtual bool GetTransparent() const;
+  bool GetTransparent() const;
 
 public:
   /**

diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index ab91dfaa7a3473c86d25d088999093517467be43..a70d8845468c4e5db4f8b4b06899bf5ddfae3c79 100644 (file)
--- a/dali/internal/event/actors/custom-actor-internal.h
+++ b/dali/internal/event/actors/custom-actor-internal.h
@@ -62,22 +62,6 @@ public:
    */
   Dali::TypeInfo GetTypeInfo();
 
-  /**
-   * @copydoc Internal::CustomActorImpl::SetTransparent()
-   */
-  void SetTransparent(bool transparent) override
-  {
-    Actor::SetTransparent(transparent);
-  }
-
-  /**
-   * @copydoc Internal::CustomActorImpl::GetTransparent()
-   */
-  bool GetTransparent() const override
-  {
-    return Actor::GetTransparent();
-  }
-
 protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()

diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 9c512bd54c4fd789cc9156b4e9382b8c31bfaf5b..16da6e691e04d71477f907818fdd8b88bae911ea 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -267,6 +267,16 @@ public:
    */
   virtual void OnLayoutNegotiated(float size, Dimension::Type dimension) = 0;
 
+  /**
+   * @brief Set this CustomActor is transparent or not without any affection on the child Actors.
+   */
+  void SetTransparent(bool transparent);
+
+  /**
+   * @brief Get this CustomActor is transparent or not.
+   */
+  bool GetTransparent() const;
+
   /**
    * @brief Retrieves the extension for this control.
    *
@@ -353,16 +363,6 @@ protected: // For derived classes
    */
   bool RelayoutDependentOnChildrenBase(Dimension::Type dimension = Dimension::ALL_DIMENSIONS);
 
-  /**
-   * @brief Set this CustomActor is transparent or not without any affection on the child Actors.
-   */
-  virtual void SetTransparent(bool transparent);
-
-  /**
-   * @brief Get this CustomActor is transparent or not.
-   */
-  virtual bool GetTransparent() const;
-
 public: // Not intended for application developers
   /**
    * @brief Initializes a CustomActor.