#ifndef TEST_CUSTOM_ACTOR_H
#define TEST_CUSTOM_ACTOR_H
-#include <dali/dali.h>
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/public-api/dali-core.h>
#include <dali/devel-api/object/property-helper-devel.h>
+#include <dali/integration-api/scene.h>
extern std::vector< std::string > MasterCallStack;
extern bool gOnRelayout;
static TestCustomActor NewVariant2();
static TestCustomActor NewVariant3( Actor childToAdd );
static TestCustomActor NewVariant4();
- static TestCustomActor NewVariant5();
- static TestCustomActor NewVariant6();
+ static TestCustomActor NewVariant5( Dali::Integration::Scene scene );
+ static TestCustomActor NewVariant6( Dali::Integration::Scene scene );
static TestCustomActor NewVariant7( const char* name );
static TestCustomActor NewVariant8( Actor rival );
static TestCustomActor DownCast( Dali::BaseHandle handle );
virtual ~TestCustomActor();
Impl::TestCustomActor& GetImpl();
+ TestCustomActor( TestCustomActor&& rhs ) = default;
+ TestCustomActor& operator=( TestCustomActor&& rhs ) = default;
+
std::vector< std::string >& GetMethodsCalled();
void ResetCallStack();
void SetDaliProperty(std::string s);
float TestGetWidthForHeightBase( float height );
float TestCalculateChildSizeBase( const Dali::Actor& child, Dali::Dimension::Type dimension );
bool TestRelayoutDependentOnChildrenBase( Dali::Dimension::Type dimension );
- unsigned int GetDepth();
+ uint32_t GetDepth();
private:
TestCustomActor( Impl::TestCustomActor& impl );
TEST_PROPERTY2 = Test::TestCustomActor::Property::TEST_PROPERTY2,
DEVEL_TEST_PROPERTY3 = TEST_PROPERTY2+1,
DEVEL_TEST_PROPERTY4 = TEST_PROPERTY2+2,
- DEVEL_TEST_PROPERTY5 = TEST_PROPERTY2+3
+ DEVEL_TEST_PROPERTY5 = TEST_PROPERTY2+3,
+ DEVEL_TEST_PROPERTY6 = TEST_PROPERTY2+4
};
} // Namespace Property
virtual void OnInitialize( const char* name );
void ResetCallStack();
void AddToCallStacks( const char* method );
- virtual void OnStageConnection( int depth );
- virtual void OnStageDisconnection();
- virtual void OnChildAdd(Dali::Actor& child);
- virtual void OnChildRemove(Dali::Actor& child);
- virtual void OnPropertySet( Dali::Property::Index index, Dali::Property::Value propertyValue );
- virtual void OnSizeSet(const Dali::Vector3& targetSize);
- virtual void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize);
- virtual bool OnTouchEvent(const Dali::TouchEvent& event);
- virtual bool OnHoverEvent(const Dali::HoverEvent& event);
- virtual bool OnWheelEvent(const Dali::WheelEvent& event);
- virtual bool OnKeyEvent(const Dali::KeyEvent& event);
+ void OnSceneConnection( int depth ) override;
+ void OnSceneDisconnection() override;
+ void OnChildAdd(Dali::Actor& child) override;
+ void OnChildRemove(Dali::Actor& child) override;
+ void OnPropertySet( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) override;
+ void OnSizeSet(const Dali::Vector3& targetSize) override;
+ void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize) override;
virtual void OnKeyInputFocusGained();
virtual void OnKeyInputFocusLost();
- virtual Dali::Vector3 GetNaturalSize();
- virtual float GetHeightForWidth( float width );
- virtual float GetWidthForHeight( float height );
- virtual void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container );
- virtual void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension );
- virtual void OnCalculateRelayoutSize( Dali::Dimension::Type dimension );
- virtual float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension );
- virtual void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension );
- virtual bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS );
+ Dali::Vector3 GetNaturalSize() override;
+ float GetHeightForWidth( float width ) override;
+ float GetWidthForHeight( float height ) override;
+ void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container ) override;
+ void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension ) override;
+ void OnCalculateRelayoutSize( Dali::Dimension::Type dimension ) 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;
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 );
Dali::Vector3 mSizeSet;
Dali::Vector3 mTargetSize;
bool mNego;
- unsigned int mDepth;
+ uint32_t mDepth;
float prop1;
Dali::Vector4 prop2;
Dali::Vector4 develProp3;
int develProp4;
float develProp5;
+ float develProp6;
};
inline TestCustomActor& GetImpl( Test::TestCustomActor& handle )
/**
- * Variant which adds a new child during OnStageConnection
+ * Variant which adds a new child during OnSceneConnection
*/
struct TestCustomActorVariant1 : public TestCustomActor
{
}
// From CustomActorImpl
- virtual void OnStageConnection( int depth )
+ void OnSceneConnection( int depth ) override
{
// Chain up first
- TestCustomActor::OnStageConnection( depth );
+ TestCustomActor::OnSceneConnection( depth );
// Add the child
Self().Add( mChildToAdd );
};
/**
- * Variant which removes children during OnStageConnection
+ * Variant which removes children during OnSceneConnection
*/
struct TestCustomActorVariant2 : public TestCustomActor
{
}
// From CustomActorImpl
- virtual void OnStageConnection( int depth )
+ virtual void OnSceneConnection( int depth )
{
// Chain up first
- TestCustomActor::OnStageConnection( depth );
+ TestCustomActor::OnSceneConnection( depth );
// Remove all the children
- for( unsigned int i=0, num=Self().GetChildCount(); i<num; ++i )
+ for( uint32_t i=0, num=Self().GetChildCount(); i<num; ++i )
{
Self().Remove( Self().GetChildAt(0) );
}
};
/**
- * Variant which adds a new child during OnStageDisconnection
+ * Variant which adds a new child during OnSceneDisconnection
*/
struct TestCustomActorVariant3 : public TestCustomActor
{
}
// From CustomActorImpl
- virtual void OnStageDisconnection()
+ virtual void OnSceneDisconnection()
{
// Chain up first
- TestCustomActor::OnStageDisconnection();
+ TestCustomActor::OnSceneDisconnection();
// Add the child
Self().Add( mChildToAdd );
};
/**
- * Variant which removes children during OnStageDisconnection
+ * Variant which removes children during OnSceneDisconnection
*/
struct TestCustomActorVariant4 : public TestCustomActor
{
}
// From CustomActorImpl
- virtual void OnStageDisconnection()
+ virtual void OnSceneDisconnection()
{
// Chain up first
- TestCustomActor::OnStageDisconnection();
+ TestCustomActor::OnSceneDisconnection();
// Remove all the children
- for( unsigned int i=0, num=Self().GetChildCount(); i<num; ++i )
+ for( uint32_t i=0, num=Self().GetChildCount(); i<num; ++i )
{
Self().Remove( Self().GetChildAt(0) );
}
};
/**
- * Variant which removes its parent from Stage during OnStageConnection
+ * Variant which removes its parent from Stage during OnSceneConnection
*/
struct TestCustomActorVariant5 : public TestCustomActor
{
/**
* Constructor
*/
- TestCustomActorVariant5()
+ TestCustomActorVariant5(Dali::Integration::Scene scene)
+ : mScene(scene)
{
}
// From CustomActorImpl
- virtual void OnStageConnection( int depth )
+ virtual void OnSceneConnection( int depth )
{
// Chain up first
- TestCustomActor::OnStageConnection( depth );
+ TestCustomActor::OnSceneConnection( depth );
// Take parent off-stage
Dali::Actor parent = Self().GetParent();
if ( parent )
{
- Dali::Stage::GetCurrent().Remove( parent );
+ mScene.Remove( parent );
}
}
+
+private:
+ Dali::Integration::Scene mScene;
};
/**
- * Variant which adds its parent to Stage during OnStageDisconnection
+ * Variant which adds its parent to Stage during OnSceneDisconnection
*/
struct TestCustomActorVariant6 : public TestCustomActor
{
/**
* Constructor
*/
- TestCustomActorVariant6()
+ TestCustomActorVariant6(Dali::Integration::Scene scene)
+ : mScene(scene)
{
}
// From CustomActorImpl
- virtual void OnStageDisconnection()
+ virtual void OnSceneDisconnection()
{
// Chain up first
- TestCustomActor::OnStageDisconnection();
+ TestCustomActor::OnSceneDisconnection();
// Put parent on-stage
Dali::Actor parent = Self().GetParent();
if ( parent )
{
- Dali::Stage::GetCurrent().Add( parent );
+ mScene.Add( parent );
}
}
+
+private:
+ Dali::Integration::Scene mScene;
};
/**
virtual void OnInitialize( const char* name )
{
// We need to do this early, before the OnChildAdd is recorded
- Self().SetName( name );
+ Self().SetProperty( Dali::Actor::Property::NAME, name );
mContainer = Dali::Actor::New();
- mContainer.SetName( "Container" );
+ mContainer.SetProperty( Dali::Actor::Property::NAME, "Container" );
Self().Add( mContainer );
}
* Constructor
*/
SimpleTestCustomActor()
- : CustomActorImpl( ActorFlags( REQUIRES_TOUCH_EVENTS | DISABLE_SIZE_NEGOTIATION ) )
+ : CustomActorImpl( ActorFlags( DISABLE_SIZE_NEGOTIATION ) )
{
}
}
// From CustomActorImpl
- virtual void OnStageConnection( int depth )
- {
- }
- virtual void OnStageDisconnection()
- {
- }
- virtual void OnChildAdd(Dali::Actor& child)
+ void OnSceneConnection( int depth ) override
{
}
- virtual void OnChildRemove(Dali::Actor& child)
- {
- }
- virtual void OnSizeSet(const Dali::Vector3& targetSize)
+ void OnSceneDisconnection() override
{
}
- virtual void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize)
+ void OnChildAdd(Dali::Actor& child) override
{
}
- virtual bool OnTouchEvent(const Dali::TouchEvent& event)
+ void OnChildRemove(Dali::Actor& child) override
{
- return true;
}
- virtual bool OnHoverEvent(const Dali::HoverEvent& event)
+ void OnSizeSet(const Dali::Vector3& targetSize) override
{
- return true;
}
- virtual bool OnWheelEvent(const Dali::WheelEvent& event)
+ void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize) override
{
- return true;
- }
- virtual bool OnKeyEvent(const Dali::KeyEvent& event)
- {
- return true;
}
virtual void OnKeyInputFocusGained()
{
virtual void OnKeyInputFocusLost()
{
}
-
- virtual Dali::Vector3 GetNaturalSize()
+ Dali::Vector3 GetNaturalSize() override
{
return Dali::Vector3( 0.0f, 0.0f, 0.0f );
}
- virtual float GetHeightForWidth( float width )
+ float GetHeightForWidth( float width ) override
{
return 0.0f;
}
- virtual float GetWidthForHeight( float height )
+ float GetWidthForHeight( float height ) override
{
return 0.0f;
}
- virtual void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container )
+ void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container ) override
{
}
- virtual void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension )
+ void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension ) override
{
}
- virtual void OnCalculateRelayoutSize( Dali::Dimension::Type dimension )
+ void OnCalculateRelayoutSize( Dali::Dimension::Type dimension ) override
{
}
- virtual float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension )
+ float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension ) override
{
return 0.0f;
}
- virtual void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension )
+ void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension ) override
{
}
- virtual bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS )
+ bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS ) override
{
return false;
}
projects / platform / core / uifw / dali-core.git / blobdiff