Revert "[Tizen] fix visual artifact of Transition"

This reverts commit 7dd7f6cce36039c904d335267680edbbecb2eb89.

diff --git a/dali-toolkit/internal/transition/transition-base-impl.h b/dali-toolkit/internal/transition/transition-base-impl.h
index 9dc3b73..76ab1d8 100644 (file)
--- a/dali-toolkit/internal/transition/transition-base-impl.h
+++ b/dali-toolkit/internal/transition/transition-base-impl.h
@@ -161,11 +161,6 @@ protected:
    */
   Vector4 GetWorldColor(Dali::Actor actor);
 
-  bool IsTransitionWithChild()
-  {
-    return mTransitionWithChild;
-  }
-
 protected:
   /**
    * Construct a new TransitionBase.

diff --git a/dali-toolkit/internal/transition/transition-impl.cpp b/dali-toolkit/internal/transition/transition-impl.cpp
index d9cffb3..f771585 100644 (file)
--- a/dali-toolkit/internal/transition/transition-impl.cpp
+++ b/dali-toolkit/internal/transition/transition-impl.cpp
@@ -129,14 +129,7 @@ void Transition::OnPlay()
   SetFinishPropertyMap(finishPropertyMap);
 
   // source View becomes transparent during transition.
-  if(IsTransitionWithChild())
-  {
-    mSourceView[Dali::Actor::Property::VISIBLE] = false;
-  }
-  else
-  {
-    GetImplementation(mSourceView).SetTransparent(true);
-  }
+  GetImplementation(mSourceView).SetTransparent(true);
 
   Dali::Animation animation = GetAnimation();
   if(!animation)
@@ -151,14 +144,7 @@ void Transition::OnFinished()
 {
   if(mShowSourceAfterFinished)
   {
-    if(IsTransitionWithChild())
-    {
-      mSourceView[Dali::Actor::Property::VISIBLE] = true;
-    }
-    else
-    {
-      GetImplementation(mSourceView).SetTransparent(false);
-    }
+    GetImplementation(mSourceView).SetTransparent(false);
   }
 }
 

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 80e03f8..b989941 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -767,6 +767,16 @@ void Control::CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Contr
   }
 }
 
+void Control::SetTransparent(bool transparent)
+{
+  CustomActorImpl::SetTransparent(transparent);
+}
+
+bool Control::GetTransparent() const
+{
+  return CustomActorImpl::GetTransparent();
+}
+
 void Control::MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index index, AlphaFunction alphaFunction, TimePeriod timePeriod)
 {
   Dali::Toolkit::Control sourceHandle      = Dali::Toolkit::Control::DownCast(source);

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 18aaac6..b3d542f 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -264,6 +264,16 @@ public:
    */
   virtual void CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod);
 
+  /**
+   * @brief Set this Control is transparent or not without any affection on the child Actors.
+   */
+  void SetTransparent(bool transparent) override;
+
+  /**
+   * @brief Get this Control is transparent or not.
+   */
+  bool GetTransparent() const override;
+
   // Signals
 
   /**