Revert "[Tizen] fix visual artifact of Transition"

This reverts commit 5a077592e2da33b37b0c789ee4ded94929fcc78b.

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index e763dab..9e41cbc 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1252,12 +1252,12 @@ public:
   /**
    * @brief Set this Actor is transparent or not without any affection on the child Actors.
    */
-  void SetTransparent(bool transparent);
+  virtual void SetTransparent(bool transparent);
 
   /**
    * @brief Get this Actor is transparent or not.
    */
-  bool GetTransparent() const;
+  virtual 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 a70d884..ab91dfa 100644 (file)
--- a/dali/internal/event/actors/custom-actor-internal.h
+++ b/dali/internal/event/actors/custom-actor-internal.h
@@ -62,6 +62,22 @@ 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 16da6e6..9c512bd 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -268,16 +268,6 @@ 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.
    *
    * @SINCE_1_0.0
@@ -363,6 +353,16 @@ 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.