From 35a3df5b847f20eb23d88dbad0eb6964cf0ebbf9 Mon Sep 17 00:00:00 2001
From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Tue, 1 Jun 2021 09:54:08 +0900
Subject: [PATCH] [Tizen] fix visual artifact of Transition

This reverts commit 829e16f8a78bc0f138c2147bf56bf3afc9deee5f.
---
 dali/internal/event/actors/actor-impl.h            |  4 ++--
 dali/internal/event/actors/custom-actor-internal.h | 16 ----------------
 dali/public-api/actors/custom-actor-impl.h         | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index c4b5b85..b6964cb 100644
--- 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 ab91dfa..a70d884 100644
--- 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 9c512bd..16da6e6 100644
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -268,6 +268,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.
    *
    * @SINCE_1_0.0
@@ -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.
-- 
2.7.4