/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
#include <dali-toolkit/dali-toolkit.h>
// INTERNAL INCLUDES
Geometry pentagonGeometry = Geometry::New();
pentagonGeometry.AddVertexBuffer( pentagonVertices );
pentagonGeometry.SetIndexBuffer( INDICES[0], INDICES_SIZE[0] );
- pentagonGeometry.SetGeometryType( Geometry::LINES );
+ pentagonGeometry.SetType( Geometry::LINES );
return pentagonGeometry;
}
* @param[in] application The application instance
*/
ExampleController( Application& application )
- : mApplication( application )
+ : mApplication( application ),
+ mStageSize(),
+ mShader(),
+ mGeometry(),
+ mRenderer(),
+ mMeshActor(),
+ mButtons(),
+ mMinusButton(),
+ mPlusButton(),
+ mIndicesCountLabel(),
+ mPrimitiveType( Geometry::LINES ),
+ mCurrentIndexCount( 0 ),
+ mMaxIndexCount( 0 )
{
// Connect to the Application's Init signal
mApplication.InitSignal().Connect( this, &ExampleController::Create );
for( int i = 0; i < 3; ++i )
{
- Property::Map labelMap;
- labelMap[ "text" ] = labels[i];
- labelMap[ "textColor" ] = Vector4( 0.8f, 0.8f, 0.8f, 1.0f );
-
Dali::Toolkit::RadioButton radio = Dali::Toolkit::RadioButton::New();
- radio.SetProperty( Dali::Toolkit::RadioButton::Property::LABEL, labelMap );
+ radio.SetProperty( Toolkit::Button::Property::LABEL,
+ Property::Map()
+ .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
+ .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
+ .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
+ );
+
radio.SetParentOrigin( ParentOrigin::TOP_LEFT );
radio.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- radio.SetSelected( i == 0 );
+ radio.SetProperty( Toolkit::Button::Property::SELECTED, i == 0 );
radio.PressedSignal().Connect( this, &ExampleController::OnButtonPressed );
mButtons[i] = radio;
modeSelectTableView.AddChild( radio, Toolkit::TableView::CellPosition( i, 0 ) );
elementCountTableView.SetFitWidth( 1 );
elementCountTableView.SetFitWidth( 2 );
mMinusButton = Toolkit::PushButton::New();
- mMinusButton.SetLabelText( "<<" );
+ mMinusButton.SetProperty( Toolkit::Button::Property::LABEL, "<<" );
mMinusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
mMinusButton.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
Toolkit::PushButton mPlusButton = Toolkit::PushButton::New();
- mPlusButton.SetLabelText( ">>" );
+ mPlusButton.SetProperty( Toolkit::Button::Property::LABEL, ">>" );
mPlusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
mPlusButton.SetAnchorPoint( AnchorPoint::CENTER_RIGHT );
std::stringstream str;
str << mCurrentIndexCount;
mIndicesCountLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, str.str() );
- mGeometry.SetGeometryType( mPrimitiveType );
+ mGeometry.SetType( mPrimitiveType );
mGeometry.SetIndexBuffer( INDICES[ indicesArray ], INDICES_SIZE[ indicesArray ] );
mRenderer.SetIndexRange( 0, mCurrentIndexCount );
return true;
Toolkit::PushButton mMinusButton;
Toolkit::PushButton mPlusButton;
Toolkit::TextLabel mIndicesCountLabel;
- Geometry::GeometryType mPrimitiveType;
+ Geometry::Type mPrimitiveType;
int mCurrentIndexCount;
int mMaxIndexCount;
};
-void RunTest( Application& application )
-{
- ExampleController test( application );
-
- application.MainLoop();
-}
-
-// Entry point for Linux & SLP applications
-//
int DALI_EXPORT_API main( int argc, char **argv )
{
Application application = Application::New( &argc, &argv );
-
- RunTest( application );
-
+ ExampleController test( application );
+ application.MainLoop();
return 0;
}