/*
- * 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.
#include <sstream>
#include <iostream>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+
using namespace Dali;
using Dali::Toolkit::TextLabel;
const float DEFAULT_OPT_COL_COUNT ( 4 );
const float DEFAULT_OPT_PAGE_COUNT ( 10 );
const bool DEFAULT_OPT_USE_TABLEVIEW ( true );
-const bool DEFAULT_OPT_BATCHING_ENABLED ( true );
const bool DEFAULT_OPT_ICON_LABELS ( true );
const IconType DEFAULT_OPT_ICON_TYPE ( IMAGEVIEW );
+const bool DEFAULT_OPT_USE_TEXT_LABEL ( false );
// The image/label area tries to make sure the positioning will be relative to previous sibling
const float IMAGE_AREA ( 0.60f );
mCols( DEFAULT_OPT_COL_COUNT ),
mPageCount( DEFAULT_OPT_PAGE_COUNT ),
mTableViewEnabled( DEFAULT_OPT_USE_TABLEVIEW ),
- mBatchingEnabled( DEFAULT_OPT_BATCHING_ENABLED ),
mIconLabelsEnabled( DEFAULT_OPT_ICON_LABELS ),
- mIconType( DEFAULT_OPT_ICON_TYPE )
+ mIconType( DEFAULT_OPT_ICON_TYPE ),
+ mUseTextLabel( DEFAULT_OPT_USE_TEXT_LABEL )
{
}
int mCols;
int mPageCount;
bool mTableViewEnabled;
- bool mBatchingEnabled;
bool mIconLabelsEnabled;
IconType mIconType;
+ bool mUseTextLabel;
};
// animation script data
imagePath << IMAGE_PATH_PREFIX << currentIconIndex << IMAGE_PATH_POSTFIX;
map[ Dali::Toolkit::ImageVisual::Property::URL ] = imagePath.str();
- // Enable/disable batching
- map[ Toolkit::ImageVisual::Property::BATCHING_ENABLED ] = mConfig.mBatchingEnabled;
-
imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
return button;
}
- void AddIconsToPage( Actor page )
+ void AddIconsToPage( Actor page, bool useTextLabel )
{
Size stageSize( Stage::GetCurrent().GetSize() );
const float scaledHeight = stageSize.y * PAGE_SCALE_FACTOR_Y;
if( mConfig.mIconLabelsEnabled )
{
// create label
- Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );
- textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
- textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
- textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
- textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
- textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f );
- textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
- textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" );
- icon.Add( textLabel );
+ if( useTextLabel )
+ {
+ Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( DEMO_APPS_NAMES[currentIconIndex] );
+ textLabel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+ textLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+ textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+ textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
+ textLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f );
+ textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+ textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "TOP" );
+ icon.Add( textLabel );
+ }
+ else
+ {
+ Property::Map map;
+ map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ).
+ Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ).
+ Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ).
+ Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f ).
+ Add( Toolkit::TextVisual::Property::HORIZONTAL_ALIGNMENT, "CENTER" ).
+ Add( Toolkit::TextVisual::Property::VERTICAL_ALIGNMENT, "TOP" );
+
+ Toolkit::Control control = Toolkit::Control::New();
+ control.SetProperty( Toolkit::Control::Property::BACKGROUND, map );
+ control.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+ control.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+ icon.Add( control );
+ }
}
iconView.Add( icon );
Actor page = AddPage();
// Populate icons.
- AddIconsToPage( page );
+ AddIconsToPage( page, mConfig.mUseTextLabel );
// Move page 'a little bit up'.
page.SetParentOrigin( ParentOrigin::CENTER );
page.SetAnchorPoint( AnchorPoint::CENTER );
page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) );
mScrollParent.Add( page );
-
- if( mConfig.mTableViewEnabled && mConfig.mBatchingEnabled )
- {
- page.SetProperty( DevelActor::Property::BATCH_PARENT, true );
- }
}
mScrollParent.SetOpacity( 1.0f );
PrintHelp( "c<num>", " Number of columns" );
PrintHelp( "r<num>", " Number of rows" );
PrintHelp( "p<num>", " Number of pages ( must be greater than 1 )" );
- PrintHelp( "-disable-tableview", " Disables the use of TableView for layouting (must be enabled for batching)" );
- PrintHelp( "-disable-batching", " Disables geometry batching" );
+ PrintHelp( "-disable-tableview", " Disables the use of TableView for layouting" );
PrintHelp( "-disable-icon-labels", " Disables labels for each icon" );
PrintHelp( "-use-checkbox", " Uses checkboxes for icons" );
+ PrintHelp( "-use-text-label", " Uses TextLabel instead of a TextVisual" );
return;
}
{
config.mTableViewEnabled = false;
}
- else if( arg.compare( "--disable-batching" ) == 0 )
- {
- config.mBatchingEnabled = false;
- }
else if( arg.compare( "--disable-icon-labels" ) == 0 )
{
config.mIconLabelsEnabled = false;
{
config.mIconType = CHECKBOX;
}
- else if ( arg.compare( "--help" ) == 0 )
+ else if( arg.compare("--use-text-label" ) == 0)
+ {
+ config.mUseTextLabel = true;
+ }
+ else if( arg.compare( "--help" ) == 0 )
{
printHelpAndExit = true;
}
projects / platform / core / uifw / dali-demo.git / blobdiff