Revert "[Tizen] Adds transition effect"

This reverts commit 63f11b400bb157ac83c571f5bd827bfedff00a6c.

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
index 87c141a..e4f1099 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
@@ -204,16 +204,6 @@ uint32_t TestCustomActor::GetDepth()
   return GetImpl().mDepth;
 }
 
   return GetImpl().mDepth;
 }
 

-void TestCustomActor::SetTransparent(bool transparent)
-{
-  return GetImpl().SetTransparent(transparent);
-}
-
-bool TestCustomActor::GetTransparent()
-{
-  return GetImpl().GetTransparent();
-}
-

 TestCustomActor::TestCustomActor()
 {
 }
 TestCustomActor::TestCustomActor()
 {
 }


@@ -396,16 +386,6 @@ bool TestCustomActor::RelayoutDependentOnChildren(Dimension::Type dimension)
   return false;
 }
 
   return false;
 }
 

-void TestCustomActor::SetTransparent(bool transparent)
-{
-  CustomActorImpl::SetTransparent(transparent);
-}
-
-bool TestCustomActor::GetTransparent() const
-{
-  return CustomActorImpl::GetTransparent();
-}
-

 void TestCustomActor::SetDaliProperty(std::string s)
 {
   Self().SetProperty(mDaliProperty, s);
 void TestCustomActor::SetDaliProperty(std::string s)
 {
   Self().SetProperty(mDaliProperty, s);

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
index 83b1fd5..ed11c58 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
@@ -2,7 +2,7 @@
 #define TEST_CUSTOM_ACTOR_H
 
 /*
 #define TEST_CUSTOM_ACTOR_H
 
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -89,8 +89,6 @@ public:
   float                     TestCalculateChildSizeBase(const Dali::Actor& child, Dali::Dimension::Type dimension);
   bool                      TestRelayoutDependentOnChildrenBase(Dali::Dimension::Type dimension);
   uint32_t                  GetDepth();
   float                     TestCalculateChildSizeBase(const Dali::Actor& child, Dali::Dimension::Type dimension);
   bool                      TestRelayoutDependentOnChildrenBase(Dali::Dimension::Type dimension);
   uint32_t                  GetDepth();

-  void                      SetTransparent(bool transparent);
-  bool                      GetTransparent();

 
 private:
   TestCustomActor(Impl::TestCustomActor& impl);
 
 private:
   TestCustomActor(Impl::TestCustomActor& impl);


@@ -148,8 +146,6 @@ public:
   float                        CalculateChildSize(const Dali::Actor& child, Dali::Dimension::Type dimension) override;
   void                         OnLayoutNegotiated(float size, Dali::Dimension::Type dimension) override;
   bool                         RelayoutDependentOnChildren(Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS) override;
   float                        CalculateChildSize(const Dali::Actor& child, Dali::Dimension::Type dimension) override;
   void                         OnLayoutNegotiated(float size, Dali::Dimension::Type dimension) override;
   bool                         RelayoutDependentOnChildren(Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS) override;

-  void                         SetTransparent(bool transparent) override;
-  bool                         GetTransparent() const override;

   static void                  SetProperty(Dali::BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value);
   static Dali::Property::Value GetProperty(Dali::BaseObject* object, Dali::Property::Index index);
 
   static void                  SetProperty(Dali::BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value);
   static Dali::Property::Value GetProperty(Dali::BaseObject* object, Dali::Property::Index index);
 

diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp
index 809f08f..02324d3 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Actor.cpp
+++ b/automated-tests/src/dali/utc-Dali-Actor.cpp
@@ -647,75 +647,6 @@ int UtcDaliActorRemoveP(void)
   END_TEST;
 }
 
   END_TEST;
 }
 

-int UtcDaliActorSwitchParentP(void)
-{
-  tet_infoline("Testing Actor::UtcDaliActorSwitchParentP");
-  TestApplication application;
-
-  Actor parent1 = Actor::New();
-  Actor child   = Actor::New();
-
-  application.GetScene().Add(parent1);
-
-  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
-
-  parent1.Add(child);
-
-  DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
-
-  Actor parent2 = Actor::New();
-  application.GetScene().Add(parent2);
-  DevelActor::SwitchParent(child, parent2);
-
-  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
-  DALI_TEST_EQUALS(parent2.GetChildCount(), 1u, TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliActorSwitchParentN(void)
-{
-  tet_infoline("Testing Actor::UtcDaliActorSwitchParentN");
-  TestApplication application;
-
-  Actor parent1 = Actor::New();
-  Actor child   = Actor::New();
-
-  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
-
-  parent1.Add(child);
-
-  DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
-
-  Actor parent2 = Actor::New();
-
-  // Try switch parent with that both of parent1 and parent2 are off scene.
-  try
-  {
-    DevelActor::SwitchParent(child, parent2);
-    tet_printf("Assertion test failed - no Exception\n");
-    tet_result(TET_FAIL);
-  }
-  catch(Dali::DaliException& e)
-  {
-    DALI_TEST_PRINT_ASSERT(e);
-    DALI_TEST_ASSERT(e, "parent", TEST_LOCATION);
-    DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
-    DALI_TEST_EQUALS(parent2.GetChildCount(), 0u, TEST_LOCATION);
-    application.GetScene().Add(parent1);
-    application.GetScene().Add(parent2);
-    DevelActor::SwitchParent(child, parent2);
-    DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
-    DALI_TEST_EQUALS(parent2.GetChildCount(), 1u, TEST_LOCATION);
-  }
-  catch(...)
-  {
-    tet_printf("Assertion test failed - wrong Exception\n");
-    tet_result(TET_FAIL);
-  }
-  END_TEST;
-}
-

 int UtcDaliActorGetChildCount(void)
 {
   TestApplication application;
 int UtcDaliActorGetChildCount(void)
 {
   TestApplication application;

diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
index 235b5a8..208f563 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp
+++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -1081,29 +1081,6 @@ int UtcDaliCustomActorCustomActor(void)
   END_TEST;
 }
 
   END_TEST;
 }
 

-int UtcDaliCustomActorImplSetTransparent(void)
-{
-  TestApplication application; // Need the type registry
-
-  Test::TestCustomActor actor = Test::TestCustomActor::New();
-  application.GetScene().Add(actor);
-  actor.SetProperty(Actor::Property::OPACITY, 0.1f);
-  actor.SetProperty(Actor::Property::SIZE, Vector2(400, 400));
-
-  DALI_TEST_EQUALS(false, actor.GetTransparent(), TEST_LOCATION);
-
-  actor.SetTransparent(true);
-
-  // flush the queue and render once
-  application.SendNotification();
-  application.Render();
-
-  DALI_TEST_EQUALS(true, actor.GetTransparent(), TEST_LOCATION);
-
-  application.GetScene().Remove(actor);
-  END_TEST;
-}
-

 int UtcDaliCustomActorImplRelayoutRequest(void)
 {
   TestApplication application;
 int UtcDaliCustomActorImplRelayoutRequest(void)
 {
   TestApplication application;

diff --git a/automated-tests/src/dali/utc-Dali-Processors.cpp b/automated-tests/src/dali/utc-Dali-Processors.cpp
index 0d1b864..9f797fb 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Processors.cpp
+++ b/automated-tests/src/dali/utc-Dali-Processors.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -31,7 +31,7 @@ public:
   {
   }
 
   {
   }
 

-  virtual void Process(bool postProcessor)
+  virtual void Process()

   {
     processRun = true;
   }
   {
     processRun = true;
   }


@@ -114,39 +114,4 @@ int UtcDaliCoreProcessorMultipleP(void)
   DALI_TEST_CHECK(testProcessor3.processRun);
 
   END_TEST;
   DALI_TEST_CHECK(testProcessor3.processRun);
 
   END_TEST;

-}
-
-int UtcDaliCorePostProcessorP(void)
-{
-  TestApplication application;
-
-  TestProcessor      testProcessor;
-  Integration::Core& core = application.GetCore();
-  core.RegisterProcessor(testProcessor, true);
-
-  tet_infoline("Test that the processor has not been executed yet:");
-  DALI_TEST_CHECK(testProcessor.processRun == false);
-
-  application.SendNotification();
-
-  tet_infoline("Test that the processor has been executed:");
-  DALI_TEST_CHECK(testProcessor.processRun);
-
-  // Clear down for next part of test
-  testProcessor.processRun = false;
-
-  core.UnregisterProcessor(testProcessor);
-  application.SendNotification();
-  tet_infoline("Test that the processor is still executed:");
-  DALI_TEST_CHECK(testProcessor.processRun);
-
-  // Clear down for next part of test
-  testProcessor.processRun = false;
-
-  core.UnregisterProcessor(testProcessor, true);
-  application.SendNotification();
-  tet_infoline("Test that the processor has not been executed again:");
-  DALI_TEST_CHECK(testProcessor.processRun == false);
-
-  END_TEST;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/dali/devel-api/actors/actor-devel.cpp b/dali/devel-api/actors/actor-devel.cpp
index 650fe92..fd08434 100755 (executable)
--- a/dali/devel-api/actors/actor-devel.cpp
+++ b/dali/devel-api/actors/actor-devel.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -53,11 +53,6 @@ Actor::TouchEventSignalType& InterceptTouchedSignal(Actor actor)
   return GetImplementation(actor).InterceptTouchedSignal();
 }
 
   return GetImplementation(actor).InterceptTouchedSignal();
 }
 

-void SwitchParent(Actor actor, Actor newParent)
-{
-  return GetImplementation(actor).SwitchParent(GetImplementation(newParent));
-}
-

 } // namespace DevelActor
 
 } // namespace Dali
 } // namespace DevelActor
 
 } // namespace Dali

diff --git a/dali/devel-api/actors/actor-devel.h b/dali/devel-api/actors/actor-devel.h
index 33df9ab..5821af0 100755 (executable)
--- a/dali/devel-api/actors/actor-devel.h
+++ b/dali/devel-api/actors/actor-devel.h
@@ -2,7 +2,7 @@
 #define DALI_ACTOR_DEVEL_H
 
 /*
 #define DALI_ACTOR_DEVEL_H
 
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -272,14 +272,6 @@ DALI_CORE_API ChildOrderChangedSignalType& ChildOrderChangedSignal(Actor actor);
  */
 DALI_CORE_API Actor::TouchEventSignalType& InterceptTouchedSignal(Actor actor);
 
  */
 DALI_CORE_API Actor::TouchEventSignalType& InterceptTouchedSignal(Actor actor);
 

-/**
- * Switch parent in the same tree.
- * Both of current parent Actor and new parent Actor must be added on Scene.
- * If not, use Add() instead.
- * This method don't emit any notification such as off scene, on scene, added or removed.
- */
-DALI_CORE_API void SwitchParent(Actor actor, Actor newParent);
-

 } // namespace DevelActor
 
 } // namespace Dali
 } // namespace DevelActor
 
 } // namespace Dali

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index 99001f3..3942bea 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -130,14 +130,14 @@ void Core::PostRender(bool uploadOnly)
   mImpl->PostRender(uploadOnly);
 }
 
   mImpl->PostRender(uploadOnly);
 }
 

-void Core::RegisterProcessor(Processor& processor, bool postProcessor)
+void Core::RegisterProcessor(Processor& processor)

 {
 {

-  mImpl->RegisterProcessor(processor, postProcessor);
+  mImpl->RegisterProcessor(processor);

 }
 
 }
 

-void Core::UnregisterProcessor(Processor& processor, bool postProcessor)
+void Core::UnregisterProcessor(Processor& processor)

 {
 {

-  mImpl->UnregisterProcessor(processor, postProcessor);
+  mImpl->UnregisterProcessor(processor);

 }
 
 ObjectRegistry Core::GetObjectRegistry() const
 }
 
 ObjectRegistry Core::GetObjectRegistry() const

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index 1dd070d..4952c57 100644 (file)
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -392,16 +392,14 @@ public:
    *
    * Note, Core does not take ownership of this processor.
    * @param[in] processor The process to register
    *
    * Note, Core does not take ownership of this processor.
    * @param[in] processor The process to register

-   * @param[in] postProcessor set this processor required to be called after size negotiation. Default is false.

    */
    */

-  void RegisterProcessor(Processor& processor, bool postProcessor = false);
+  void RegisterProcessor(Processor& processor);

 
   /**
    * @brief Unregister a processor
    * @param[in] processor The process to unregister
 
   /**
    * @brief Unregister a processor
    * @param[in] processor The process to unregister

-   * @param[in] postProcessor True if the processor to be unregister is for post processor.

    */
    */

-  void UnregisterProcessor(Processor& processor, bool postProcessor = false);
+  void UnregisterProcessor(Processor& processor);

 
   /**
    * @brief Gets the Object registry.
 
   /**
    * @brief Gets the Object registry.

diff --git a/dali/integration-api/processor-interface.h b/dali/integration-api/processor-interface.h
index 45408ff..70c01bd 100644 (file)
--- a/dali/integration-api/processor-interface.h
+++ b/dali/integration-api/processor-interface.h
@@ -2,7 +2,7 @@
 #define DALI_INTEGRATION_PROCESSOR_INTERFACE_H
 
 /*
 #define DALI_INTEGRATION_PROCESSOR_INTERFACE_H
 
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -35,7 +35,7 @@ public:
   /**
    * @brief Run the processor
    */
   /**
    * @brief Run the processor
    */

-  virtual void Process(bool postProcessor = false) = 0;
+  virtual void Process() = 0;

 
 protected:
   /**
 
 protected:
   /**

diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index 6d129e6..41adba0 100644 (file)
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -297,9 +297,6 @@ void Core::ProcessEvents()
   // Run the size negotiation after event processing finished signal
   mRelayoutController->Relayout();
 
   // Run the size negotiation after event processing finished signal
   mRelayoutController->Relayout();
 

-  // Run any registered post processors
-  RunPostProcessors();
-

   // Rebuild depth tree after event processing has finished
   for(auto scene : scenes)
   {
   // Rebuild depth tree after event processing has finished
   for(auto scene : scenes)
   {


@@ -331,35 +328,17 @@ uint32_t Core::GetMaximumUpdateCount() const
   return MAXIMUM_UPDATE_COUNT;
 }
 
   return MAXIMUM_UPDATE_COUNT;
 }
 

-void Core::RegisterProcessor(Integration::Processor& processor, bool postProcessor)
+void Core::RegisterProcessor(Integration::Processor& processor)

 {
 {

-  if(postProcessor)
-  {
-    mPostProcessors.PushBack(&processor);
-  }
-  else
-  {
-    mProcessors.PushBack(&processor);
-  }
+  mProcessors.PushBack(&processor);

 }
 
 }
 

-void Core::UnregisterProcessor(Integration::Processor& processor, bool postProcessor)
+void Core::UnregisterProcessor(Integration::Processor& processor)

 {
 {

-  if(postProcessor)
+  auto iter = std::find(mProcessors.Begin(), mProcessors.End(), &processor);
+  if(iter != mProcessors.End())

   {
   {

-    auto iter = std::find(mPostProcessors.Begin(), mPostProcessors.End(), &processor);
-    if(iter != mPostProcessors.End())
-    {
-      mPostProcessors.Erase(iter);
-    }
-  }
-  else
-  {
-    auto iter = std::find(mProcessors.Begin(), mProcessors.End(), &processor);
-    if(iter != mProcessors.End())
-    {
-      mProcessors.Erase(iter);
-    }
+    mProcessors.Erase(iter);

   }
 }
 
   }
 }
 


@@ -372,21 +351,7 @@ void Core::RunProcessors()
   {
     if(processor)
     {
   {
     if(processor)
     {

-      processor->Process(false);
-    }
-  }
-}
-
-void Core::RunPostProcessors()
-{
-  // Copy processor pointers to prevent changes to vector affecting loop iterator.
-  Dali::Vector<Integration::Processor*> processors(mPostProcessors);
-
-  for(auto processor : processors)
-  {
-    if(processor)
-    {
-      processor->Process(true);
+      processor->Process();

     }
   }
 }
     }
   }
 }

diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 9744d0d..3f0307d 100644 (file)
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -175,12 +175,12 @@ public:
   /**
    * @copydoc Dali::Integration::Core::RegisterProcessor
    */
   /**
    * @copydoc Dali::Integration::Core::RegisterProcessor
    */

-  void RegisterProcessor(Integration::Processor& processor, bool postProcessor = false);
+  void RegisterProcessor(Dali::Integration::Processor& processor);

 
   /**
    * @copydoc Dali::Integration::Core::UnregisterProcessor
    */
 
   /**
    * @copydoc Dali::Integration::Core::UnregisterProcessor
    */

-  void UnregisterProcessor(Dali::Integration::Processor& processor, bool postProcessor = false);
+  void UnregisterProcessor(Dali::Integration::Processor& processor);

 
   /**
    * @copydoc Dali::Internal::ThreadLocalStorage::AddScene()
 
   /**
    * @copydoc Dali::Internal::ThreadLocalStorage::AddScene()


@@ -245,11 +245,6 @@ private:
    */
   void RunProcessors();
 
    */
   void RunProcessors();
 

-  /**
-   * Run each registered postprocessor
-   */
-  void RunPostProcessors();
-

   // for use by ThreadLocalStorage
 
   /**
   // for use by ThreadLocalStorage
 
   /**


@@ -348,7 +343,6 @@ private:
   OwnerPointer<NotificationManager>             mNotificationManager;   ///< Notification manager
   OwnerPointer<GestureEventProcessor>           mGestureEventProcessor; ///< The gesture event processor
   Dali::Vector<Integration::Processor*>         mProcessors;            ///< Registered processors (not owned)
   OwnerPointer<NotificationManager>             mNotificationManager;   ///< Notification manager
   OwnerPointer<GestureEventProcessor>           mGestureEventProcessor; ///< The gesture event processor
   Dali::Vector<Integration::Processor*>         mProcessors;            ///< Registered processors (not owned)

-  Dali::Vector<Integration::Processor*>         mPostProcessors;        ///< Registered post processors those will called after relayout(not owned)

 
   using SceneContainer = std::vector<ScenePtr>;
   SceneContainer mScenes; ///< A container of scenes that bound to a surface for rendering, owned by Core
 
   using SceneContainer = std::vector<ScenePtr>;
   SceneContainer mScenes; ///< A container of scenes that bound to a surface for rendering, owned by Core

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index db54144..408c273 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -1118,16 +1118,6 @@ DevelBlendEquation::Type Actor::GetBlendEquation() const
   return mBlendEquation;
 }
 
   return mBlendEquation;
 }
 

-void Actor::SetTransparent(bool transparent)
-{
-  SetTransparentMessage(GetEventThreadServices(), GetNode(), transparent);
-}
-
-bool Actor::GetTransparent() const
-{
-  return GetNode().GetTransparent();
-}
-

 void Actor::SetDrawMode(DrawMode::Type drawMode)
 {
   // this flag is not animatable so keep the value
 void Actor::SetDrawMode(DrawMode::Type drawMode)
 {
   // this flag is not animatable so keep the value


@@ -1407,48 +1397,6 @@ void Actor::Remove(Actor& child)
   mParentImpl.Remove(child);
 }
 
   mParentImpl.Remove(child);
 }
 

-void Actor::SwitchParent(Actor& newParent)
-{
-  DALI_ASSERT_ALWAYS(this != &newParent && "Cannot add actor to itself");
-
-  DALI_ASSERT_ALWAYS((this->OnScene() && newParent.OnScene()) && "Both of current parent and new parent must be on Scene");
-
-  Actor* oldParent = this->GetParent();
-  if(oldParent->RemoveWithoutNotify(*this))
-  {
-    // Only put in a relayout request if there is a suitable dependency
-    if(oldParent->RelayoutDependentOnChildren())
-    {
-      oldParent->RelayoutRequest();
-    }
-  }
-
-  newParent.AddWithoutNotify(*this);
-  mParent            = &newParent;
-  Actor* parentActor = static_cast<Actor*>(&newParent);
-  mScene             = parentActor->mScene;
-
-  // Resolve the name and index for the child properties if any
-  ResolveChildProperties();
-
-  this->InheritLayoutDirectionRecursively(newParent.GetLayoutDirection());
-  // Only put in a relayout request if there is a suitable dependency
-  if(newParent.RelayoutDependentOnChildren())
-  {
-    newParent.RelayoutRequest();
-  }
-}
-
-void Actor::AddWithoutNotify(Actor& child)
-{
-  mParentImpl.AddWithoutNotify(child);
-}
-
-bool Actor::RemoveWithoutNotify(Actor& child)
-{
-  return mParentImpl.RemoveWithoutNotify(child);
-}
-

 uint32_t Actor::GetChildCount() const
 {
   return mParentImpl.GetChildCount();
 uint32_t Actor::GetChildCount() const
 {
   return mParentImpl.GetChildCount();


@@ -1646,8 +1594,6 @@ void Actor::NotifyStageDisconnection()
     {
       mOnSceneSignalled = false; // signal required next time Actor is added
     }
     {
       mOnSceneSignalled = false; // signal required next time Actor is added
     }

-
-    SetTransparent(false);

   }
 }
 
   }
 }
 

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 959f5f9..106af0d 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -200,21 +200,6 @@ public:
   void Remove(Actor& child) override;
 
   /**
   void Remove(Actor& child) override;
 
   /**

-   * @copydoc Dali::DevelActor::SwitchParent()
-   */
-  void SwitchParent(Actor& newParent);
-
-  /**
-   * @copydoc Dali::Internal::ActorParent::AddWithoutNotify()
-   */
-  void AddWithoutNotify(Actor& child);
-
-  /**
-   * @copydoc Dali::Internal::ActorParent::RemoveWithoutNotify()
-   */
-  bool RemoveWithoutNotify(Actor& child);
-
-  /**

    * @copydoc Dali::Actor::Unparent
    */
   void Unparent();
    * @copydoc Dali::Actor::Unparent
    */
   void Unparent();


@@ -1229,7 +1214,7 @@ public:
   void RemoveRenderer(uint32_t index);
 
   /**
   void RemoveRenderer(uint32_t index);
 
   /**

-   * @brief Set BlendEquation at each renderer that added on this Actor.
+   * Set BlendEquation at each renderer that added on this Actor.

    */
   void SetBlendEquation(DevelBlendEquation::Type blendEquation);
 
    */
   void SetBlendEquation(DevelBlendEquation::Type blendEquation);
 


@@ -1238,16 +1223,6 @@ public:
    */
   DevelBlendEquation::Type GetBlendEquation() const;
 
    */
   DevelBlendEquation::Type GetBlendEquation() const;
 

-  /**
-   * @brief Set this Actor is transparent or not without any affection on the child Actors.
-   */
-  virtual void SetTransparent(bool transparent);
-
-  /**
-   * @brief Get this Actor is transparent or not.
-   */
-  virtual bool GetTransparent() const;
-

 public:
   /**
    * Converts screen coordinates into the actor's coordinate system.
 public:
   /**
    * Converts screen coordinates into the actor's coordinate system.

diff --git a/dali/internal/event/actors/actor-parent-impl.cpp b/dali/internal/event/actors/actor-parent-impl.cpp
index 87b02cd..c0101cc 100644 (file)
--- a/dali/internal/event/actors/actor-parent-impl.cpp
+++ b/dali/internal/event/actors/actor-parent-impl.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -62,6 +62,11 @@ void ActorParentImpl::Add(Actor& child)
   DALI_ASSERT_ALWAYS(&mOwner != &child && "Cannot add actor to itself");
   DALI_ASSERT_ALWAYS(!child.IsRoot() && "Cannot add root actor");
 
   DALI_ASSERT_ALWAYS(&mOwner != &child && "Cannot add actor to itself");
   DALI_ASSERT_ALWAYS(!child.IsRoot() && "Cannot add root actor");
 

+  if(!mChildren)
+  {
+    mChildren = new ActorContainer;
+  }
+

   Actor* oldParent = child.GetParent();
 
   // child might already be ours
   Actor* oldParent = child.GetParent();
 
   // child might already be ours


@@ -83,7 +88,7 @@ void ActorParentImpl::Add(Actor& child)
     if(!child.GetParent())
     {
       // Do this first, since user callbacks from within SetParent() may need to remove child
     if(!child.GetParent())
     {
       // Do this first, since user callbacks from within SetParent() may need to remove child

-      AddWithoutNotify(child);
+      mChildren->push_back(ActorPtr(&child));

 
       // SetParent asserts that child can be added
       child.SetParent(&mOwner);
 
       // SetParent asserts that child can be added
       child.SetParent(&mOwner);


@@ -105,44 +110,10 @@ void ActorParentImpl::Add(Actor& child)
 
 void ActorParentImpl::Remove(Actor& child)
 {
 
 void ActorParentImpl::Remove(Actor& child)
 {

-  bool removed = RemoveWithoutNotify(child);
-
-  if(removed)
-  {
-    child.SetParent(nullptr);
-    // Only put in a relayout request if there is a suitable dependency
-    if(mOwner.RelayoutDependentOnChildren())
-    {
-      mOwner.RelayoutRequest();
-    }
-  }
-
-  // Notification for derived classes
-  mOwner.OnChildRemove(child);
-  EmitChildRemovedSignal(child);
-}
-
-void ActorParentImpl::AddWithoutNotify(Actor& child)
-{
-  if(!mChildren)
-  {
-    mChildren = new ActorContainer;
-  }
-
-  // child might already be ours
-  if(&mOwner != child.GetParent())
-  {
-    // Do this first, since user callbacks from within SetParent() may need to remove child
-    mChildren->push_back(ActorPtr(&child));
-  }
-}
-
-bool ActorParentImpl::RemoveWithoutNotify(Actor& child)
-{

   if((&mOwner == &child) || (!mChildren))
   {
     // no children or removing itself
   if((&mOwner == &child) || (!mChildren))
   {
     // no children or removing itself

-    return false;
+    return;

   }
 
   ActorPtr removed;
   }
 
   ActorPtr removed;


@@ -162,11 +133,24 @@ bool ActorParentImpl::RemoveWithoutNotify(Actor& child)
       mChildren->erase(iter);
 
       DALI_ASSERT_DEBUG(actor->GetParent() == &mOwner);
       mChildren->erase(iter);
 
       DALI_ASSERT_DEBUG(actor->GetParent() == &mOwner);

+      actor->SetParent(nullptr);

 
       break;
     }
   }
 
       break;
     }
   }

-  return removed;
+
+  if(removed)
+  {
+    // Only put in a relayout request if there is a suitable dependency
+    if(mOwner.RelayoutDependentOnChildren())
+    {
+      mOwner.RelayoutRequest();
+    }
+  }
+
+  // Notification for derived classes
+  mOwner.OnChildRemove(child);
+  EmitChildRemovedSignal(child);

 }
 
 uint32_t ActorParentImpl::GetChildCount() const
 }
 
 uint32_t ActorParentImpl::GetChildCount() const

diff --git a/dali/internal/event/actors/actor-parent-impl.h b/dali/internal/event/actors/actor-parent-impl.h
index 16cea6c..0f05f80 100644 (file)
--- a/dali/internal/event/actors/actor-parent-impl.h
+++ b/dali/internal/event/actors/actor-parent-impl.h
@@ -62,25 +62,6 @@ public:
   void Remove(Actor& child);
 
   /**
   void Remove(Actor& child);
 
   /**

-   * Adds a child Actor to this ActorParent.
-   * @pre The child actor is not the same as the parent actor.
-   * @pre The child actor could already have a parent.
-   * @param [in] child The child.
-   * @post The child will be referenced by its parent
-   * @note Even though child has already a parent, this method didn't emit off scene callback.
-   */
-  void AddWithoutNotify(Actor& child);
-
-  /**
-   * Removes a child Actor from this ActorParent.
-   * @param [in] child The child.
-   * @post The child will be unreferenced.
-   * @note This method do not call off scene callback of child.
-   * This method must be called just for switching parent Actor.
-   */
-  bool RemoveWithoutNotify(Actor& child);
-
-  /**

    * Retrieve the number of children held by the actor.
    * @return The number of children
    */
    * Retrieve the number of children held by the actor.
    * @return The number of children
    */

diff --git a/dali/internal/event/actors/actor-property-handler.cpp b/dali/internal/event/actors/actor-property-handler.cpp
index a8362e9..02fc9ce 100644 (file)
--- a/dali/internal/event/actors/actor-property-handler.cpp
+++ b/dali/internal/event/actors/actor-property-handler.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index ab91dfa..a70d884 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();
 
    */
   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()
 protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()

diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp
index ab3e9a2..662f3e7 100644 (file)
--- a/dali/internal/update/nodes/node.cpp
+++ b/dali/internal/update/nodes/node.cpp
@@ -101,8 +101,7 @@ Node::Node()
   mClippingMode(ClippingMode::DISABLED),
   mIsRoot(false),
   mIsLayer(false),
   mClippingMode(ClippingMode::DISABLED),
   mIsRoot(false),
   mIsLayer(false),

-  mPositionUsesAnchorPoint(true),
-  mTransparent(false)
+  mPositionUsesAnchorPoint(true)

 {
   mUniformMapChanged[0] = 0u;
   mUniformMapChanged[1] = 0u;
 {
   mUniformMapChanged[0] = 0u;
   mUniformMapChanged[1] = 0u;

diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
index 07ce462..6f6e681 100644 (file)
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -725,16 +725,6 @@ public:
     return mDrawMode;
   }
 
     return mDrawMode;
   }
 

-  void SetTransparent(bool transparent)
-  {
-    mTransparent = transparent;
-  }
-
-  bool GetTransparent() const
-  {
-    return mTransparent;
-  }
-

   /*
    * Returns the transform id of the node
    * @return The transform component id of the node
   /*
    * Returns the transform id of the node
    * @return The transform component id of the node


@@ -964,7 +954,6 @@ protected:
   bool               mIsRoot : 1;                  ///< True if the node cannot have a parent
   bool               mIsLayer : 1;                 ///< True if the node is a layer
   bool               mPositionUsesAnchorPoint : 1; ///< True if the node should use the anchor-point when calculating the position
   bool               mIsRoot : 1;                  ///< True if the node cannot have a parent
   bool               mIsLayer : 1;                 ///< True if the node is a layer
   bool               mPositionUsesAnchorPoint : 1; ///< True if the node should use the anchor-point when calculating the position

-  bool               mTransparent : 1;

 
   // Changes scope, should be at end of class
   DALI_LOG_OBJECT_STRING_DECLARATION;
 
   // Changes scope, should be at end of class
   DALI_LOG_OBJECT_STRING_DECLARATION;


@@ -1049,17 +1038,6 @@ inline void SetDrawModeMessage(EventThreadServices& eventThreadServices, const N
   new(slot) LocalType(&node, &Node::SetDrawMode, drawMode);
 }
 
   new(slot) LocalType(&node, &Node::SetDrawMode, drawMode);
 }
 

-inline void SetTransparentMessage(EventThreadServices& eventThreadServices, const Node& node, bool transparent)
-{
-  using LocalType = MessageValue1<Node, bool>;
-
-  // Reserve some memory inside the message queue
-  uint32_t* slot = eventThreadServices.ReserveMessageSlot(sizeof(LocalType));
-
-  // Construct message in the message queue memory; note that delete should not be called on the return value
-  new(slot) LocalType(&node, &Node::SetTransparent, transparent);
-}
-

 inline void DetachRendererMessage(EventThreadServices& eventThreadServices, const Node& node, const Renderer& renderer)
 {
   using LocalType = MessageValue1<Node, const Renderer*>;
 inline void DetachRendererMessage(EventThreadServices& eventThreadServices, const Node& node, const Renderer& renderer)
 {
   using LocalType = MessageValue1<Node, const Renderer*>;

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index f073879..1ecf4ff 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -191,6 +191,7 @@ bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
       const UniformMap& rendererUniformMap = PropertyOwner::GetUniformMap();
 
       auto size = rendererUniformMap.Count();
       const UniformMap& rendererUniformMap = PropertyOwner::GetUniformMap();
 
       auto size = rendererUniformMap.Count();

+

       if(mShader)
       {
         size += mShader->GetUniformMap().Count();
       if(mShader)
       {
         size += mShader->GetUniformMap().Count();


@@ -695,11 +696,6 @@ Renderer::OpacityType Renderer::GetOpacityType(BufferIndex updateBufferIndex, co
 {
   Renderer::OpacityType opacityType = Renderer::OPAQUE;
 
 {
   Renderer::OpacityType opacityType = Renderer::OPAQUE;
 

-  if(node.GetTransparent())
-  {
-    return Renderer::TRANSPARENT;
-  }
-

   switch(mBlendMode)
   {
     case BlendMode::ON: // If the renderer should always be use blending
   switch(mBlendMode)
   {
     case BlendMode::ON: // If the renderer should always be use blending

diff --git a/dali/public-api/actors/custom-actor-impl.cpp b/dali/public-api/actors/custom-actor-impl.cpp
index d42e57e..1ff533b 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.cpp
+++ b/dali/public-api/actors/custom-actor-impl.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -83,14 +83,4 @@ bool CustomActorImpl::RelayoutDependentOnChildrenBase(Dimension::Type dimension)
   return mOwner->RelayoutDependentOnChildrenBase(dimension);
 }
 
   return mOwner->RelayoutDependentOnChildrenBase(dimension);
 }
 

-void CustomActorImpl::SetTransparent(bool transparent)
-{
-  mOwner->SetTransparent(transparent);
-}
-
-bool CustomActorImpl::GetTransparent() const
-{
-  return mOwner->GetTransparent();
-}
-

 } // namespace Dali
 } // namespace Dali

diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 9c512bd..1400f45 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -353,16 +353,6 @@ protected: // For derived classes
    */
   bool RelayoutDependentOnChildrenBase(Dimension::Type dimension = Dimension::ALL_DIMENSIONS);
 
    */
   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.
 public: // Not intended for application developers
   /**
    * @brief Initializes a CustomActor.

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 32844da..43b1478 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -116,6 +116,7 @@ SET( public_api_core_animation_header_files
   ${public_api_src_dir}/animation/time-period.h
 )
 
   ${public_api_src_dir}/animation/time-period.h
 )
 

+

 SET( public_api_core_common_header_files
   ${public_api_src_dir}/common/constants.h
   ${public_api_src_dir}/common/dali-common.h
 SET( public_api_core_common_header_files
   ${public_api_src_dir}/common/constants.h
   ${public_api_src_dir}/common/dali-common.h