/*
- * Copyright (c) 2014 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.
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include "dummy-control.h"
using namespace Dali;
using namespace Toolkit;
Actor CreateColorActor( const Vector4& color )
{
- Actor solidColorActor = Actor::New();
+ DummyControl solidColorActor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(solidColorActor.GetImplementation());
VisualFactory factory = VisualFactory::Get();
Dali::Property::Map map;
- map[ "rendererType" ] = "COLOR";
- map[ "mixColor" ] = color;
+ map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
+ map[ ColorVisual::Property::MIX_COLOR ] = color;
Visual::Base colorVisual = factory.CreateVisual( map );
- colorVisual.SetOnStage( solidColorActor );
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, colorVisual );
return solidColorActor;
}
DALI_TEST_CHECK( toolbar2 == toolbar );
//Additional check to ensure object is created by checking if it's registered
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+ ObjectRegistry registry = application.GetCore().GetObjectRegistry();
DALI_TEST_CHECK( registry );
gObjectCreatedCallBackCalled = false;
DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
Actor actor = toolbar;
- toolbar == ToolBar::DownCast( actor );
+ toolbar = ToolBar::DownCast( actor );
DALI_TEST_CHECK( toolbar );
END_TEST;
try
{
Actor control1 = CreateColorActor( Color::RED );
- control1.SetSize( Vector2( 100.f, 100.f ) );
+ control1.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control2 = CreateColorActor( Color::RED );
- control2.SetSize( Vector2( 100.f, 100.f ) );
+ control2.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control3 = CreateColorActor( Color::RED );
- control3.SetSize( Vector2( 100.f, 100.f ) );
+ control3.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control4 = CreateColorActor( Color::RED );
- control4.SetSize( Vector2( 100.f, 100.f ) );
+ control4.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control5 = CreateColorActor( Color::RED );
- control5.SetSize( Vector2( 100.f, 100.f ) );
+ control5.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
ToolBar toolbar = ToolBar::New();
- toolbar.SetSize( Vector2( 600.f, 100.f ) );
+ toolbar.SetProperty( Actor::Property::SIZE, Vector2( 600.f, 100.f ) );
application.Render();
application.SendNotification();
application.SendNotification();
toolbar.Add( control1 );
- toolbar.AddControl( control2, 0.1f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
- toolbar.AddControl( control3, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
- toolbar.AddControl( control4, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
- toolbar.AddControl( control5, 0.1f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control5, 0.1f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
Actor control6 = CreateColorActor( Color::RED );
- control6.SetSize( Vector2( 100.f, 100.f ) );
+ control6.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control7 = CreateColorActor( Color::RED );
- control7.SetSize( Vector2( 100.f, 100.f ) );
+ control7.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
Actor control8 = CreateColorActor( Color::RED );
- control8.SetSize( Vector2( 100.f, 100.f ) );
+ control8.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) );
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- toolbar.AddControl( control6, 0.4f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
- toolbar.AddControl( control7, 0.2f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
- toolbar.AddControl( control8, 0.2f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
+ toolbar.AddControl( control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) );
}
catch( ... )
{
Actor control = CreateColorActor( Color::RED );
ToolBar toolbar = ToolBar::New();
- toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );
+ toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
toolbar.RemoveControl( control );
}
ToolBar toolbar01 = ToolBar::New();
ToolBar toolbar02 = ToolBar::New();
- toolbar01.AddControl( control01, 0.1f, Alignment::HorizontalLeft );
- toolbar02.AddControl( control02, 0.1f, Alignment::HorizontalLeft );
+ toolbar01.AddControl( control01, 0.1f, Alignment::HORIZONTAL_LEFT );
+ toolbar02.AddControl( control02, 0.1f, Alignment::HORIZONTAL_LEFT );
toolbar02.RemoveControl( control01 );
}
Actor control = CreateColorActor( Color::RED );
ToolBar toolbar = ToolBar::New();
- toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft );
+ toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT );
toolbar.RemoveControl( control );
toolbar.RemoveControl( control );