/*
- * Copyright (c) 2015 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 <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
using namespace Dali;
namespace
{
-const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";
-const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";
-const char* const IMAGE = DALI_IMAGE_DIR "background-magnifier.jpg";
+const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
+const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
+const char* const IMAGE = DEMO_IMAGE_DIR "background-magnifier.jpg";
const char* const TOOLBAR_TITLE = "Negotiate Size";
const unsigned int TABLEVIEW_BUTTON_ITEMS_COUNT = sizeof( TABLEVIEW_BUTTON_ITEMS ) / sizeof( TABLEVIEW_BUTTON_ITEMS[0] );
+
+Actor CreateSolidColor( Vector4 color )
+{
+ Toolkit::Control control = Toolkit::Control::New();
+
+ Property::Map map;
+ map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR;
+ map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color;
+ control.SetProperty( Toolkit::Control::Property::BACKGROUND, map );
+
+ return control;
+}
+
} // anonymous namespace
// The Init signal is received once (only) during the Application lifetime
Stage stage = Stage::GetCurrent();
- // Respond to key events
+ // Respond to key events if not handled
stage.KeyEventSignal().Connect(this, &SizeNegotiationController::OnKeyEvent);
// Creates a default view with a default tool bar.
table.SetName( "TABLEVIEW_BUTTON_1CELL_ID" );
table.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.Add( backing );
table.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 0 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 0 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 0 ) );
}
// Column 0
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 0 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 0 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 0 ) );
}
// Column 1
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 1 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 1 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 1 ) );
}
// Column 2
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 2 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.5f, 0.5f, 0.5f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.5f, 0.5f, 0.5f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 2 ) );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.5f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.5f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 2 ) );
}
table.SetFixedHeight( 0, 50.0f );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.SetFixedHeight( 2, 50.0f );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
table.SetFitHeight( 2 );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 100.0f );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 100.0f );
table.SetFitHeight( 1 );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 200.0f );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
table.SetFitHeight( 2 );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 100.0f );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 200.0f );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 300.0f );
table.SetFitHeight( 1 );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
backing.SetSize( 0.0f, 100.0f );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 200.0f );
table.SetFitHeight( 1 );
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
table.Add( backing );
}
{
- Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+ Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
backing.SetSize( 0.0f, 200.0f );
mPopup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
- ImageActor image = ImageActor::New( ResourceImage::New( IMAGE ) );
+ Toolkit::ImageView image = Toolkit::ImageView::New( IMAGE );
image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mPopup.Add( image );
mPopup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
- ImageActor image = ImageActor::New( ResourceImage::New( IMAGE ) );
+ Toolkit::ImageView image = Toolkit::ImageView::New( IMAGE );
image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
image.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
mPopup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
- ImageActor image = ImageActor::New( ResourceImage::New( IMAGE ) );
+ Toolkit::ImageView image = Toolkit::ImageView::New( IMAGE );
image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
image.SetSizeScalePolicy( SizeScalePolicy::FILL_WITH_ASPECT_RATIO );
{
Toolkit::PushButton popupButton = Toolkit::PushButton::New();
popupButton.SetName( TABLEVIEW_BUTTON_ITEMS[ itemId ].name );
- popupButton.SetLabelText( TABLEVIEW_BUTTON_ITEMS[ itemId ].text );
+ popupButton.SetProperty( Toolkit::Button::Property::LABEL, TABLEVIEW_BUTTON_ITEMS[ itemId ].text );
popupButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
popupButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
Layer mContentLayer; ///< Content layer.
Toolkit::TextLabel mTitleActor; ///< Title text.
- Toolkit::Popup mMenu; ///< The navigation menu todor.
+ Toolkit::Popup mMenu; ///< The navigation menu.
Toolkit::Popup mPopup; ///< The current example popup.
Toolkit::ItemView mItemView; ///< ItemView to hold test images.
};
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
{
+ Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
SizeNegotiationController test( application );
-
application.MainLoop();
-}
-
-// Entry point for Linux & SLP applications
-int main( int argc, char **argv )
-{
- Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
-
- RunTest( application );
-
return 0;
}