INCLUDE_DIRECTORIES(
${${CAPI_LIB}_INCLUDE_DIRS}
../dali-toolkit/dali-toolkit-test-utils
- ../../../base
- ../../../optional
+ ../../../
)
ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
const char* const PROPERTY_NAME_ROWS = "rows";
const char* const PROPERTY_NAME_COLUMNS = "columns";
const char* const PROPERTY_NAME_CELL_PADDING = "cell-padding";
-const char* const PROPERTY_NAME_LAYOUT_ANIMATION_DURATION = "layout-animation-duration";
const char* const PROPERTY_NAME_LAYOUT_ROWS = "layout-rows";
const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layout-columns";
DALI_TEST_CHECK(tableView);
Stage::GetCurrent().Add( tableView );
- tableView.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, Constraint100() ) );
- tableView.SetLayoutAnimationDuration(0.0f);
+ tableView.SetSize( Dali::Vector3( 100.0f, 100.0f, 100.0f ) );
actor1 = Actor::New();
actor2 = Actor::New();
}
-// Test animation duration setting.
-int UtcDaliTableViewAnimation(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline("UtcDaliTableViewAnimation");
- TableView tableView = TableView::New(10,10);
- DALI_TEST_CHECK(tableView);
-
- tableView.SetLayoutAnimationDuration(5.0f);
- DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 5.0f, TEST_LOCATION);
-
- tableView.SetLayoutAnimationDuration(2.5f);
- DALI_TEST_EQUALS(tableView.GetLayoutAnimationDuration(), 2.5f, TEST_LOCATION);
- END_TEST;
-}
-
// Test Adding/Removing/Finding Children.
int UtcDaliTableViewChild(void)
{
DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION );
DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_CELL_PADDING).Get<Vector2>(), Vector2(6.f,8.f), TEST_LOCATION );
- // Test "layout-animation-duration" property
- DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ANIMATION_DURATION) == TableView::PROPERTY_LAYOUT_ANIMATION_DURATION );
-
- tableView.SetProperty( TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, 1.5f );
-
- DALI_TEST_EQUALS( tableView.GetLayoutAnimationDuration(), 1.5f, TEST_LOCATION );
- DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_LAYOUT_ANIMATION_DURATION).Get<float>(), 1.5f, TEST_LOCATION );
-
//{ "policy": "fixed", "value": 30.0 },
Property::Map item1;
item1[ "policy" ] = "fixed";
+++ /dev/null
-# Files to install here
-
-dali_toolkit_base_image_files =\
- $(toolkit_base_images_dir)/*.png
+++ /dev/null
-# Add local source files here
-
-toolkit_base_src_files = \
- $(toolkit_base_src_dir)/controls/relayout-controller.cpp \
- $(toolkit_base_src_dir)/controls/relayout-controller-impl.cpp \
- $(toolkit_base_src_dir)/controls/relayout-helper.cpp \
- $(toolkit_base_src_dir)/controls/alignment/alignment-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/check-box-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/push-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/buttons/radio-button-impl.cpp \
- $(toolkit_base_src_dir)/controls/popup/popup-impl.cpp \
- $(toolkit_base_src_dir)/controls/popup/popup-style-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
- $(toolkit_base_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scrollable-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
- $(toolkit_base_src_dir)/controls/table-view/table-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-handles-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-input/text-input-popup-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-view/relayout-utilities.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-word-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/split-by-char-policies.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-actor-cache.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-impl.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-character-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor-dbg.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \
- $(toolkit_base_src_dir)/controls/text-view/text-view-word-processor.cpp \
- $(toolkit_base_src_dir)/focus-manager/focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
- $(toolkit_base_src_dir)/styling/style-manager-impl.cpp \
- $(toolkit_base_src_dir)/builder/builder-impl.cpp \
- $(toolkit_base_src_dir)/builder/builder-animations.cpp \
- $(toolkit_base_src_dir)/builder/builder-set-property.cpp \
- $(toolkit_base_src_dir)/builder/builder-signals.cpp \
- $(toolkit_base_src_dir)/builder/builder-actor.cpp \
- $(toolkit_base_src_dir)/builder/json-parser-state.cpp \
- $(toolkit_base_src_dir)/builder/json-parser-impl.cpp \
- $(toolkit_base_src_dir)/builder/tree-node-manipulator.cpp \
- $(toolkit_base_src_dir)/builder/replacement.cpp
+++ /dev/null
-# Add local source files here
-
-public_api_base_src_files = \
- $(public_api_base_src_dir)/enums.cpp \
- $(public_api_base_src_dir)/controls/control.cpp \
- $(public_api_base_src_dir)/controls/control-impl.cpp \
- $(public_api_base_src_dir)/controls/alignment/alignment.cpp \
- $(public_api_base_src_dir)/controls/buttons/button.cpp \
- $(public_api_base_src_dir)/controls/buttons/check-box-button.cpp \
- $(public_api_base_src_dir)/controls/buttons/push-button.cpp \
- $(public_api_base_src_dir)/controls/buttons/radio-button.cpp \
- $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.cpp \
- $(public_api_base_src_dir)/controls/default-controls/check-button-factory.cpp \
- $(public_api_base_src_dir)/controls/default-controls/push-button-factory.cpp \
- $(public_api_base_src_dir)/controls/popup/popup.cpp \
- $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scrollable.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-connector.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
- $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
- $(public_api_base_src_dir)/controls/text-input/text-input.cpp \
- $(public_api_base_src_dir)/controls/text-view/text-view.cpp \
- $(public_api_base_src_dir)/focus-manager/focus-manager.cpp \
- $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.cpp \
- $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.cpp \
- $(public_api_base_src_dir)/markup-processor/markup-processor.cpp \
- $(public_api_base_src_dir)/shader-effects/image-region-effect.cpp \
- $(public_api_base_src_dir)/shader-effects/bouncing-effect.cpp \
- $(public_api_base_src_dir)/styling/style-manager.cpp \
- $(public_api_base_src_dir)/builder/builder.cpp \
- $(public_api_base_src_dir)/builder/json-parser.cpp \
- $(public_api_base_src_dir)/builder/tree-node.cpp
-
-# Add public header files here
-
-public_api_base_header_files = \
- $(public_api_base_src_dir)/enums.h
-
-public_api_base_controls_header_files = \
- $(public_api_base_src_dir)/controls/control.h \
- $(public_api_base_src_dir)/controls/control-impl.h
-
-public_api_base_alignment_header_files = \
- $(public_api_base_src_dir)/controls/alignment/alignment.h
-
-public_api_base_buttons_header_files = \
- $(public_api_base_src_dir)/controls/buttons/check-box-button.h \
- $(public_api_base_src_dir)/controls/buttons/button.h \
- $(public_api_base_src_dir)/controls/buttons/push-button.h \
- $(public_api_base_src_dir)/controls/buttons/radio-button.h
-
-public_api_base_default_controls_header_files = \
- $(public_api_base_src_dir)/controls/default-controls/check-button-factory.h \
- $(public_api_base_src_dir)/controls/default-controls/solid-color-actor.h \
- $(public_api_base_src_dir)/controls/default-controls/push-button-factory.h
-
-public_api_base_item_view_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/item-view/depth-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/roll-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/spiral-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/navigation-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/grid-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-factory.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-layout.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view.h \
- $(public_api_base_src_dir)/controls/scrollable/item-view/item-view-declarations.h
-
-public_api_base_popup_header_files = \
- $(public_api_base_src_dir)/controls/popup/popup.h
-
-public_api_base_scrollable_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h \
- $(public_api_base_src_dir)/controls/scrollable/scrollable.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-connector.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-component.h
-
-public_api_base_scroll_bar_header_files = \
- $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.h
-
-public_api_base_scroll_view_header_files = \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
- $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h
-
-public_api_base_table_view_header_files = \
- $(public_api_base_src_dir)/controls/table-view/table-view.h
-
-public_api_base_text_input_header_files = \
- $(public_api_base_src_dir)/controls/text-input/text-input.h
-
-public_api_base_text_view_header_files = \
- $(public_api_base_src_dir)/controls/text-view/text-view.h
-
-public_api_base_focus_manager_header_files = \
- $(public_api_base_src_dir)/focus-manager/keyinput-focus-manager.h \
- $(public_api_base_src_dir)/focus-manager/focus-manager.h \
- $(public_api_base_src_dir)/focus-manager/keyboard-focus-manager.h
-
-public_api_base_markup_processor_header_files = \
- $(public_api_base_src_dir)/markup-processor/markup-processor.h
-
-public_api_base_shader_effects_header_files = \
- $(public_api_base_src_dir)/shader-effects/bouncing-effect.h \
- $(public_api_base_src_dir)/shader-effects/dissolve-effect.h \
- $(public_api_base_src_dir)/shader-effects/image-region-effect.h \
- $(public_api_base_src_dir)/shader-effects/iris-effect.h \
- $(public_api_base_src_dir)/shader-effects/mask-effect.h \
- $(public_api_base_src_dir)/shader-effects/nine-patch-mask-effect.h \
- $(public_api_base_src_dir)/shader-effects/page-turn-book-spine-effect.h \
- $(public_api_base_src_dir)/shader-effects/page-turn-effect.h \
- $(public_api_base_src_dir)/shader-effects/ripple-effect.h \
- $(public_api_base_src_dir)/shader-effects/ripple2d-effect.h \
- $(public_api_base_src_dir)/shader-effects/swirl-effect.h
-
-public_api_base_styling_header_files = \
- $(public_api_base_src_dir)/styling/style-manager.h
-
-public_api_base_builder_header_files = \
- $(public_api_base_src_dir)/builder/builder.h \
- $(public_api_base_src_dir)/builder/json-parser.h \
- $(public_api_base_src_dir)/builder/tree-node.h
-
+++ /dev/null
-# Files to install here
-
-dali_toolkit_base_sound_files =\
- $(toolkit_base_sounds_dir)/*.ogg
[dali_profile=$enableval],
[dali_profile=COMMON])
-# Different platforms use either the full Toolkit or the basic version
-# The basic version excludes components under dali-toolkit/optional
-AM_CONDITIONAL([TOOLKIT_BASIC_VERSION], [test x$dali_profile = xLITE])
-
if test x$DALI_DATA_RW_DIR != x; then
dataReadWriteDir=${DALI_DATA_RW_DIR}/
else
# Build the Dali Toolkit library
-# Base files
-toolkit_base_images_dir = ../../../base/dali-toolkit/images
-toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
-toolkit_base_styles_dir = ../../../base/dali-toolkit/styles
-toolkit_base_src_dir = ../../../base/dali-toolkit/internal
-public_api_base_src_dir = ../../../base/dali-toolkit/public-api
-
-include ../../../base/dali-toolkit/images/file.list
-include ../../../base/dali-toolkit/sounds/file.list
-include ../../../base/dali-toolkit/styles/file.list
-include ../../../base/dali-toolkit/internal/file.list
-include ../../../base/dali-toolkit/public-api/file.list
-
-# Optional files
-toolkit_optional_images_dir = ../../../optional/dali-toolkit/images
-toolkit_optional_src_dir = ../../../optional/dali-toolkit/internal
-public_api_optional_src_dir = ../../../optional/dali-toolkit/public-api
-
-include ../../../optional/dali-toolkit/images/file.list
-include ../../../optional/dali-toolkit/internal/file.list
-include ../../../optional/dali-toolkit/public-api/file.list
+toolkit_images_dir = ../../../dali-toolkit/images
+toolkit_sounds_dir = ../../../dali-toolkit/sounds
+toolkit_styles_dir = ../../../dali-toolkit/styles
+toolkit_src_dir = ../../../dali-toolkit/internal
+public_api_src_dir = ../../../dali-toolkit/public-api
+
+include ../../../dali-toolkit/images/file.list
+include ../../../dali-toolkit/sounds/file.list
+include ../../../dali-toolkit/styles/file.list
+include ../../../dali-toolkit/internal/file.list
+include ../../../dali-toolkit/public-api/file.list
resources_dir = ../../../resources
daliimagedir = ${dataReadOnlyDir}/toolkit/images/
-if TOOLKIT_BASIC_VERSION
-daliimage_DATA = ${dali_toolkit_base_image_files}
-else
-daliimage_DATA = ${dali_toolkit_base_image_files} \
- ${dali_toolkit_optional_image_files}
-endif # TOOLKIT_BASIC_VERSION
+daliimage_DATA = ${dali_toolkit_image_files}
dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
-dalisound_DATA = ${dali_toolkit_base_sound_files}
+dalisound_DATA = ${dali_toolkit_sound_files}
# The library
lib_LTLIBRARIES = libdali-toolkit.la
-if TOOLKIT_BASIC_VERSION
libdali_toolkit_la_SOURCES = \
- $(toolkit_base_src_files) \
- $(public_api_base_src_files)
-else
-libdali_toolkit_la_SOURCES = \
- $(toolkit_base_src_files) \
- $(public_api_base_src_files) \
- $(toolkit_optional_src_files) \
- $(public_api_optional_src_files)
-endif # TOOLKIT_BASIC_VERSION
+ $(toolkit_src_files) \
+ $(public_api_src_files)
dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
dalistyle_DATA = ${dali_toolkit_style_files}
libdali_toolkit_la_DEPENDENCIES =
-toolkit_basic_includes = -I../../../base
-
-if ! TOOLKIT_BASIC_VERSION
-toolkit_optional_includes = -I../../../optional
-endif
-
libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
-DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
-DDALI_SOUND_DIR="\"${dalisounddir}\"" \
-DDALI_STYLE_DIR="\"${dalistyledir}\"" \
-DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
-Werror -Wall \
- $(toolkit_basic_includes) \
- $(toolkit_optional_includes) \
+ -I../../../ \
$(DALI_TOOLKIT_CFLAGS) \
$(DALICORE_CFLAGS) \
$(DALI_CFLAGS) \
$(FRIBIDI_LIBS) \
$(HTMLCXX_LIBS)
-# Install Base headers
-
-toplevelbasedir = $(devincludepath)/dali-toolkit
-
-publicapibasedir = $(toplevelbasedir)/public-api
-publicapibasecontrolsdir = $(publicapibasedir)/controls
-publicapibasealignmentdir = $(publicapibasedir)/controls/alignment
-publicapibasebuttonsdir = $(publicapibasedir)/controls/buttons
-publicapibasedefaultcontrolsdir = $(publicapibasedir)/controls/default-controls
-publicapibaseitemviewdir = $(publicapibasedir)/controls/scrollable/item-view
-publicapibasepopupdir = $(publicapibasedir)/controls/popup
-publicapibasescrollbardir = $(publicapibasedir)/controls/scroll-bar
-publicapibasescrollcomponentdir = $(publicapibasedir)/controls/scroll-component
-publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
-publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
-publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
-publicapibasetextviewdir = $(publicapibasedir)/controls/text-view
-publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
-publicapibasefactorydir = $(publicapibasedir)/factory
-publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
-publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
-publicapibaseshadereffectsdir = $(publicapibasedir)/shader-effects
-publicapibasestylingdir = $(publicapibasedir)/styling
-publicapibasebuilderdir = $(publicapibasedir)/builder
-
-publicapibase_HEADERS = $(public_api_base_header_files)
-publicapibasecontrols_HEADERS = $(public_api_base_controls_header_files)
-publicapibasealignment_HEADERS = $(public_api_base_alignment_header_files)
-publicapibasebuttons_HEADERS = $(public_api_base_buttons_header_files)
-publicapibasedefaultcontrols_HEADERS = $(public_api_base_default_controls_header_files)
-publicapibaseitemview_HEADERS = $(public_api_base_item_view_header_files)
-publicapibasepopup_HEADERS = $(public_api_base_popup_header_files)
-publicapibasescrollbar_HEADERS = $(public_api_base_scroll_bar_header_files)
-publicapibasescrollcomponent_HEADERS = $(public_api_base_scroll_component_header_files)
-publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
-publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
-publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
-publicapibasetextview_HEADERS = $(public_api_base_text_view_header_files)
-publicapibasetextinput_HEADERS = $(public_api_base_text_input_header_files)
-publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
-publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
-publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)
-publicapibasestyling_HEADERS = $(public_api_base_styling_header_files)
-publicapibasebuilder_HEADERS = $(public_api_base_builder_header_files)
-
-# Install Optional headers
-
-topleveloptionaldir = $(devincludepath)/dali-toolkit
-topleveloptional_HEADERS = ../../../optional/dali-toolkit/dali-toolkit.h
-
-publicapioptionaldir = $(topleveloptionaldir)/public-api
-publicapioptionalcontrolsdir = $(publicapioptionaldir)/controls
-publicapioptionalbloomviewdir = $(publicapioptionaldir)/controls/bloom-view
-publicapioptionalclusterdir = $(publicapioptionaldir)/controls/cluster
-publicapioptionaleffectsviewdir = $(publicapioptionaldir)/controls/effects-view
-publicapioptionalgaussianblurviewdir = $(publicapioptionaldir)/controls/gaussian-blur-view
-publicapioptionalimageviewdir = $(publicapioptionaldir)/controls/image-view
-publicapioptionalmagnifierdir = $(publicapioptionaldir)/controls/magnifier
-publicapioptionalpageturnviewdir = $(publicapioptionaldir)/controls/page-turn-view
-publicapioptionalsliderdir = $(publicapioptionaldir)/controls/slider
-publicapioptionaltoolbardir = $(publicapioptionaldir)/controls/tool-bar
-publicapioptionalselectorsdir = $(publicapioptionaldir)/controls/selectors
-publicapioptionalshadowviewdir = $(publicapioptionaldir)/controls/shadow-view
-publicapioptionalbubbleemitterdir = $(publicapioptionaldir)/controls/bubble-effect
-publicapioptionalsuperblurviewdir = $(publicapioptionaldir)/controls/super-blur-view
-publicapioptionalviewdir = $(publicapioptionaldir)/controls/view
-publicapioptionalnavigationframedir = $(publicapioptionaldir)/controls/navigation-frame
-publicapioptionalshadereffectsdir = $(publicapioptionaldir)/shader-effects
-publicapioptionalbubbleeffectdir = $(publicapioptionaldir)/shader-effects/bubble-effect
-publicapioptionaltransitioneffectsdir = $(publicapioptionaldir)/transition-effects
-
-publicapioptional_HEADERS = $(public_api_optional_header_files)
-publicapioptionalcontrols_HEADERS = $(public_api_optional_controls_header_files)
-publicapioptionalbloomview_HEADERS = $(public_api_optional_bloom_view_header_files)
-publicapioptionalcluster_HEADERS = $(public_api_optional_cluster_header_files)
-publicapioptionaleffectsview_HEADERS = $(public_api_optional_effects_view_header_files)
-publicapioptionalgaussianblurview_HEADERS = $(public_api_optional_gaussian_blur_view_header_files)
-publicapioptionalimageview_HEADERS = $(public_api_optional_image_view_header_files)
-publicapioptionalmagnifier_HEADERS = $(public_api_optional_magnifier_header_files)
-publicapioptionalpageturnview_HEADERS = $(public_api_optional_page_turn_view_header_files)
-publicapioptionalslider_HEADERS = $(public_api_optional_slider_header_files)
-publicapioptionaltoolbar_HEADERS = $(public_api_optional_tool_bar_header_files)
-publicapioptionalselectors_HEADERS = $(public_api_optional_selectors_header_files)
-publicapioptionalshadowview_HEADERS = $(public_api_optional_shadow_view_header_files)
-publicapioptionalbubbleemitter_HEADERS = $(public_api_optional_bubble_emitter_header_files)
-publicapioptionalsuperblurview_HEADERS = $(public_api_optional_super_blur_view_header_files)
-publicapioptionalview_HEADERS = $(public_api_optional_view_header_files)
-publicapioptionalnavigationframe_HEADERS = $(public_api_optional_navigation_frame_header_files)
-publicapioptionalshadereffects_HEADERS = $(public_api_optional_shader_effects_header_files)
-publicapioptionalbubbleeffect_HEADERS = $(public_api_optional_bubble_effect_header_files)
-publicapioptionaltransitioneffects_HEADERS = $(public_api_optional_transition_effects_header_files)
+# Install headers
+
+topleveldir = $(devincludepath)/dali-toolkit
+toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
+
+publicapidir = $(topleveldir)/public-api
+
+publicapicontrolsdir = $(publicapidir)/controls
+publicapialignmentdir = $(publicapicontrolsdir)/alignment
+publicapibloomviewdir = $(publicapicontrolsdir)/bloom-view
+publicapibubbleemitterdir = $(publicapicontrolsdir)/bubble-effect
+publicapibuttonsdir = $(publicapicontrolsdir)/buttons
+publicapiclusterdir = $(publicapicontrolsdir)/cluster
+publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls
+publicapieffectsviewdir = $(publicapicontrolsdir)/effects-view
+publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view
+publicapiimageviewdir = $(publicapicontrolsdir)/image-view
+publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view
+publicapimagnifierdir = $(publicapicontrolsdir)/magnifier
+publicapinavigationframedir = $(publicapicontrolsdir)/navigation-frame
+publicapipageturnviewdir = $(publicapicontrolsdir)/page-turn-view
+publicapipopupdir = $(publicapicontrolsdir)/popup
+publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar
+publicapiscrollcomponentdir = $(publicapicontrolsdir)/scroll-component
+publicapiscrollabledir = $(publicapicontrolsdir)/scrollable
+publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view
+publicapiselectorsdir = $(publicapicontrolsdir)/selectors
+publicapishadowviewdir = $(publicapicontrolsdir)/shadow-view
+publicapisliderdir = $(publicapicontrolsdir)/slider
+publicapisuperblurviewdir = $(publicapicontrolsdir)/super-blur-view
+publicapitableviewdir = $(publicapicontrolsdir)/table-view
+publicapitextviewdir = $(publicapicontrolsdir)/text-view
+publicapitextinputdir = $(publicapicontrolsdir)/text-input
+publicapitoolbardir = $(publicapicontrolsdir)/tool-bar
+publicapiviewdir = $(publicapicontrolsdir)/view
+
+publicapibuilderdir = $(publicapidir)/builder
+publicapifocusmanagerdir = $(publicapidir)/focus-manager
+publicapimarkupprocessordir = $(publicapidir)/markup-processor
+publicapishadereffectsdir = $(publicapidir)/shader-effects
+publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect
+publicapistylingdir = $(publicapidir)/styling
+publicapitransitioneffectsdir = $(publicapidir)/transition-effects
+
+publicapi_HEADERS = $(public_api_header_files)
+publicapicontrols_HEADERS = $(public_api_controls_header_files)
+publicapialignment_HEADERS = $(public_api_alignment_header_files)
+publicapibloomview_HEADERS = $(public_api_bloom_view_header_files)
+publicapibubbleemitter_HEADERS = $(public_api_bubble_emitter_header_files)
+publicapibuttons_HEADERS = $(public_api_buttons_header_files)
+publicapicluster_HEADERS = $(public_api_cluster_header_files)
+publicapidefaultcontrols_HEADERS = $(public_api_default_controls_header_files)
+publicapieffectsview_HEADERS = $(public_api_effects_view_header_files)
+publicapigaussianblurview_HEADERS = $(public_api_gaussian_blur_view_header_files)
+publicapiimageview_HEADERS = $(public_api_image_view_header_files)
+publicapiitemview_HEADERS = $(public_api_item_view_header_files)
+publicapimagnifier_HEADERS = $(public_api_magnifier_header_files)
+publicapinavigationframe_HEADERS = $(public_api_navigation_frame_header_files)
+publicapipageturnview_HEADERS = $(public_api_page_turn_view_header_files)
+publicapipopup_HEADERS = $(public_api_popup_header_files)
+publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files)
+publicapiscrollcomponent_HEADERS = $(public_api_scroll_component_header_files)
+publicapiscrollable_HEADERS = $(public_api_scrollable_header_files)
+publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files)
+publicapiselectors_HEADERS = $(public_api_selectors_header_files)
+publicapishadowview_HEADERS = $(public_api_shadow_view_header_files)
+publicapislider_HEADERS = $(public_api_slider_header_files)
+publicapisuperblurview_HEADERS = $(public_api_super_blur_view_header_files)
+publicapitableview_HEADERS = $(public_api_table_view_header_files)
+publicapitextview_HEADERS = $(public_api_text_view_header_files)
+publicapitextinput_HEADERS = $(public_api_text_input_header_files)
+publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files)
+publicapiview_HEADERS = $(public_api_view_header_files)
+
+publicapibuilder_HEADERS = $(public_api_builder_header_files)
+publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files)
+publicapimarkupprocessor_HEADERS = $(public_api_markup_processor_header_files)
+publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files)
+publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files)
+publicapistyling_HEADERS = $(public_api_styling_header_files)
+publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files)
# Note: If this tag is empty the current directory is searched.
INPUT = @DOXYGEN_DOCS_DIR@/content \
- ../../../../dali-toolkit/base/dali-toolkit/public-api \
- ../../../../dali-toolkit/optional/dali-toolkit/public-api \
+ ../../../../dali-toolkit/dali-toolkit/public-api \
../../../automated-tests/README.md \
@prefix@/include/dali
-#ifndef __DALI_TOOLKIT_INTERNAL_H__
-#define __DALI_TOOLKIT_INTERNAL_H__
+#ifndef __DALI_TOOLKIT_H__
+#define __DALI_TOOLKIT_H__
/*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
// Toolkit
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
+#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
#include <dali-toolkit/public-api/controls/buttons/button.h>
+#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
#include <dali-toolkit/public-api/controls/buttons/push-button.h>
#include <dali-toolkit/public-api/controls/buttons/radio-button.h>
#include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/public-api/controls/cluster/cluster.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
-#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
-#include <dali-toolkit/public-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
-#include <dali-toolkit/public-api/controls/text-input/text-input.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/public-api/enums.h>
-#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
-#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
-#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
-#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
-#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
-
-// INTERNAL INCLUDES
-
-#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
-#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
-#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
-#include <dali-toolkit/public-api/controls/cluster/cluster.h>
-
#include <dali-toolkit/public-api/controls/default-controls/check-button-factory.h>
-
+#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
#include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
+#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-
+#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/public-api/controls/popup/popup.h>
#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
#include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
#include <dali-toolkit/public-api/controls/slider/slider.h>
+#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/public-api/controls/text-input/text-input.h>
+#include <dali-toolkit/public-api/controls/text-view/text-view.h>
#include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>
#include <dali-toolkit/public-api/controls/view/view.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
-
+#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
#include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
+
#include <dali-toolkit/public-api/shader-effects/alpha-discard-effect.h>
#include <dali-toolkit/public-api/shader-effects/bendy-effect.h>
#include <dali-toolkit/public-api/shader-effects/blind-effect.h>
#include <dali-toolkit/public-api/shader-effects/water-effect.h>
#include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
#include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
+#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
+#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
+#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
+#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h>
#include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
#include <dali-toolkit/public-api/dali-toolkit-version.h>
+#include <dali-toolkit/public-api/enums.h>
-#endif // __DALI_TOOLKIT_EXT_H__
+#endif // __DALI_TOOLKIT_H__
--- /dev/null
+# Files to install here
+
+dali_toolkit_image_files =\
+ $(toolkit_images_dir)/*.png
const Vector3& currentSize( currentSizeProperty.GetVector3() );
const Vector3& parentSize( parentSizeProperty.GetVector3() );
+ return GetPosition( currentSize, parentSize );
+ }
+
+ inline Vector3 GetPosition( const Vector3& currentSize, const Vector3& parentSize )
+ {
Vector3 position( 0.f, 0.f, 0.f );
switch( mHorizontalAlignment )
{
- case Dali::Toolkit::Alignment::HorizontalLeft:
- {
- position.x += mPadding.left;
- break;
- }
- case Dali::Toolkit::Alignment::HorizontalCenter:
- {
- if( currentSize.width + mPadding.left + mPadding.right >= parentSize.width )
- {
- position.x += 0.5f * ( mPadding.left - mPadding.right );
- }
- break;
- }
- case Dali::Toolkit::Alignment::HorizontalRight:
- {
- position.x -= mPadding.right;
- break;
- }
- default:
+ case Dali::Toolkit::Alignment::HorizontalLeft:
+ {
+ position.x += mPadding.left;
+ break;
+ }
+ case Dali::Toolkit::Alignment::HorizontalCenter:
+ {
+ if( currentSize.width + mPadding.left + mPadding.right >= parentSize.width )
{
- DALI_ASSERT_ALWAYS( !"Wrong horizontal alignment value" );
- break;
+ position.x += 0.5f * ( mPadding.left - mPadding.right );
}
+ break;
+ }
+ case Dali::Toolkit::Alignment::HorizontalRight:
+ {
+ position.x -= mPadding.right;
+ break;
+ }
+ default:
+ {
+ DALI_ASSERT_ALWAYS( !"Wrong horizontal alignment value" );
+ break;
+ }
}
switch( mVerticalAlignment )
{
- case Dali::Toolkit::Alignment::VerticalTop:
- {
- position.y += mPadding.top;
- break;
- }
- case Dali::Toolkit::Alignment::VerticalCenter:
- {
- if( currentSize.height + mPadding.top + mPadding.bottom >= parentSize.height )
- {
- position.y += 0.5f * ( mPadding.top - mPadding.bottom );
- }
- break;
- }
- case Dali::Toolkit::Alignment::VerticalBottom:
- {
- position.y -= mPadding.bottom;
- break;
- }
- default:
+ case Dali::Toolkit::Alignment::VerticalTop:
+ {
+ position.y += mPadding.top;
+ break;
+ }
+ case Dali::Toolkit::Alignment::VerticalCenter:
+ {
+ if( currentSize.height + mPadding.top + mPadding.bottom >= parentSize.height )
{
- DALI_ASSERT_ALWAYS( !"Wrong vertical alignment value" );
- break;
+ position.y += 0.5f * ( mPadding.top - mPadding.bottom );
}
+ break;
+ }
+ case Dali::Toolkit::Alignment::VerticalBottom:
+ {
+ position.y -= mPadding.bottom;
+ break;
+ }
+ default:
+ {
+ DALI_ASSERT_ALWAYS( !"Wrong vertical alignment value" );
+ break;
+ }
}
return position;
const Toolkit::Alignment::Type mHorizontalAlignment;
const Toolkit::Alignment::Type mVerticalAlignment;
};
-
-void SetPositionConstraint( Actor actor, const Toolkit::Alignment::Padding& padding, Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
-{
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- LocalSource( Actor::SIZE ),
- ParentSource( Actor::SIZE ),
- PositionConstraint( padding, horizontal, vertical ) );
- actor.ApplyConstraint( constraint );
-}
} // namespace
Toolkit::Alignment Alignment::New( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
actor.SetAnchorPoint( anchorPointAndParentOrigin );
actor.SetParentOrigin( anchorPointAndParentOrigin );
- if( Toolkit::Alignment::ScaleNone != mScaling )
- {
- actor.RemoveConstraints();
- }
-
- Vector3 actorSize ( actor.GetCurrentSize() );
+ Vector3 actorSize ( actor.GetSize() );
Toolkit::Control control( Toolkit::Control::DownCast( actor ) );
if ( actorSize == Vector3::ZERO && control )
{
actorSize = control.GetNaturalSize();
}
- Vector2 childSize;
+ Vector3 childSize;
switch( mScaling )
{
case Toolkit::Alignment::ScaleNone:
{
// Nothing to do but needed just to not to jump to the default.
- childSize = size;
+ childSize = actorSize;
break;
}
case Toolkit::Alignment::ScaleToFill:
{
ScaleToFillConstraint constraint( mPadding );
- childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
- SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+ childSize = constraint.GetSize( actorSize, Vector3(size) ) ;
break;
}
case Toolkit::Alignment::ScaleToFitKeepAspect:
{
ScaleToFitKeepAspectConstraint constraint( mPadding );
- childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
- SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+ childSize = constraint.GetSize( actorSize, Vector3(size) ) ;
break;
}
case Toolkit::Alignment::ScaleToFillKeepAspect:
{
ScaleToFillKeepAspectConstraint constraint( mPadding );
- childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
- SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+ childSize = constraint.GetSize( actorSize, Vector3(size) );
break;
}
case Toolkit::Alignment::ShrinkToFit:
{
ShrinkToFitConstraint constraint( mPadding );
- childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
- SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+ childSize = constraint.GetSize( actorSize, Vector3(size) );
break;
}
case Toolkit::Alignment::ShrinkToFitKeepAspect:
{
ShrinkToFitKeepAspectConstraint constraint( mPadding );
- childSize = Vector2( constraint.GetSize( actorSize, Vector3(size) ) );
- SetPositionConstraint( actor, mPadding, mHorizontal, mVertical );
+ childSize = constraint.GetSize( actorSize, Vector3(size) );
break;
}
default:
}
}
- Relayout( actor, childSize, container );
+ PositionConstraint positionConstraint(mPadding, mHorizontal, mVertical);
+ actor.SetPosition( positionConstraint.GetPosition(childSize, actorSize) );
+
+ if( !control )
+ {
+ actor.SetScale(childSize / actorSize);
+ }
+
+ Relayout( actor, Vector2(childSize), container );
}
}
const char* const PROPERTY_TITLE = "title";
const char* const PROPERTY_STATE = "state";
-// Constraints ///////////////////////////////////////////////////////////////////////////
-
/**
- * BackgroundSizeConstraint
- *
* The background size should be at least as big as the Dialog.
* In some cases a background may have graphics which are visible
* outside of the Dialog, e.g. A Shadow. For this we need to alter
* the size of Background.
+ *
+ * @param[in] outerBorder The border to extend beyond parent's Size.
+ * @param[in] parentSize The parent's size
*/
-struct BackgroundSizeConstraint
+Vector3 BackgroundSize(const Vector4& outerBoarder, const Vector3& parentSize)
{
- /**
- * Constraint that sets size to parent's size plus a border.
- *
- * @param[in] outerBorder The border to extend beyond parent's Size.
- */
- BackgroundSizeConstraint( Vector4 outerBorder )
- : mOuterBorder( outerBorder )
- {
- }
-
- /**
- * (render thread code)
- * @param[in] current The current size.
- * @param[in] parentSizeProperty The parent's size
- */
- Vector3 operator()( const Vector3& current,
- const PropertyInput& parentSizeProperty )
- {
- Vector3 size = parentSizeProperty.GetVector3();
-
- size.width += mOuterBorder.x + mOuterBorder.y;
- size.height += mOuterBorder.z + mOuterBorder.w;
-
- return size;
- }
+ Vector3 size( parentSize );
+ size.width += outerBoarder.x + outerBoarder.y;
+ size.height += outerBoarder.z + outerBoarder.w;
- const Vector4 mOuterBorder; ///< The size of the outer-border (Set to 0.0, 0.0f, 0.0f, 0.0f if doesn't exist).
-};
+ return size;
+}
-struct ButtonAreaSizeConstraint
-{
/**
- * Constraint that sets size to parent's size plus a border.
+ * sets button area size to parent's size plus a border.
*
* @param[in] outerBorder The border to extend beyond parent's Size.
+ * @param[in] parentSize The parent's size
*/
- ButtonAreaSizeConstraint( Vector4 outerBorder )
- : mOuterBorder( outerBorder )
- {
- }
-
- /**
- * (render thread code)
- * @param[in] current The current size.
- * @param[in] parentSizeProperty The parent's size
- */
- Vector3 operator()( const Vector3& current,
- const PropertyInput& parentSizeProperty )
- {
- Vector3 size = parentSizeProperty.GetVector3();
-
- size.width += mOuterBorder.x + mOuterBorder.y;
- size.width -= (POPUP_OUT_MARGIN_WIDTH + POPUP_OUT_MARGIN_WIDTH);
- size.height = POPUP_BUTTON_BG_HEIGHT;
-
- return size;
- }
+Vector3 ButtonAreaSize( const Vector4& outBoarder, const Vector3& parentSize )
+{
+ Vector3 size( parentSize );
+ size.width += outBoarder.x + outBoarder.y;
+ size.width -= (POPUP_OUT_MARGIN_WIDTH + POPUP_OUT_MARGIN_WIDTH);
+ size.height = POPUP_BUTTON_BG_HEIGHT;
- const Vector4 mOuterBorder; ///< The size of the outer-border (Set to 0.0, 0.0f, 0.0f, 0.0f if doesn't exist).
-};
+ return size;
+}
} // unnamed namespace
mLayer.SetParentOrigin(ParentOrigin::CENTER);
mLayer.SetAnchorPoint(AnchorPoint::CENTER);
mLayer.RaiseToTop();
- mLayer.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
self.Add(mLayer);
mPopupBg = Actor::New();
mPopupBg.SetParentOrigin(ParentOrigin::CENTER);
mPopupBg.SetAnchorPoint(AnchorPoint::CENTER);
- mPopupBg.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
mLayer.Add(mPopupBg);
// Any content after this point which is added to Self() will be reparented to
}
}
+void Popup::OnControlSizeSet( const Vector3& targetSize )
+{
+ mLayer.SetSize( targetSize );
+ mPopupBg.SetSize( targetSize );
+
+ const Vector4 outerBorder = mPopupStyle->backgroundOuterBorder;
+ if( mBackgroundImage )
+ {
+ mBackgroundImage.SetSize( BackgroundSize( outerBorder,targetSize ) );
+ }
+ if( mButtonAreaImage )
+ {
+ mButtonAreaImage.SetSize( ButtonAreaSize( outerBorder, targetSize ) );
+ }
+
+}
+
void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
// Set the popup size
if( mBackgroundImage )
{
- Constraint constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- BackgroundSizeConstraint(outerBorder) );
-
- mBackgroundImage.RemoveConstraints();
- mBackgroundImage.ApplyConstraint( constraint );
-
+ mBackgroundImage.SetSize(BackgroundSize(outerBorder, Vector3(size)));
mBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
mBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
mBackgroundImage.SetPosition( -outerBorder.x, -outerBorder.y, 0.0f );
}
else
{
- Constraint constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- ButtonAreaSizeConstraint(outerBorder) );
-
- mButtonAreaImage.RemoveConstraints();
- mButtonAreaImage.ApplyConstraint( constraint );
-
+ mButtonAreaImage.SetSize( ButtonAreaSize(outerBorder, Vector3(size)) );
mButtonAreaImage.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
mButtonAreaImage.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
mButtonAreaImage.SetY( -outerBorder.z - POPUP_OUT_MARGIN_HEIGHT );
Vector3 contentSize = RelayoutHelper::GetNaturalSize( mContent );
// Choose the biggest width
naturalSize.width = std::max( naturalSize.width, contentSize.width );
+ if( naturalSize.width > maxWidth )
+ {
+ naturalSize.width = maxWidth;
+ contentSize.height = RelayoutHelper::GetHeightForWidth( mContent, maxWidth );
+ }
naturalSize.height += contentSize.height + mPopupStyle->margin;
}
virtual void OnControlChildAdd( Actor& child );
/**
- * @copydoc Control::OnRelayout()
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+ */
+ virtual void OnControlSizeSet( const Vector3& size );
+
+ /**
+ * @copydoc Control::OnRelayOut()
*/
virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
const float DEFAULT_INDICATOR_FIXED_HEIGHT(80.0f);
/**
- * Indicator size constraint
* Indicator size depends on both indicator's parent size and the scroll content size
*/
-struct IndicatorSizeConstraint
+Vector3 IndicatorSize( const Vector3& parentSize, float contentSize)
{
- /**
- * @param[in] contentSize The size of scrollable content
- */
- IndicatorSizeConstraint(float contentSize)
- : mContentSize(contentSize)
- {
- }
-
- /**
- * Constraint operator
- * @param[in] current The current indicator size
- * @param[in] parentSizeProperty The parent size of scroll indicator.
- * @return The new scroll indicator size.
- */
- Vector3 operator()(const Vector3& current,
- const PropertyInput& parentSizeProperty)
- {
- const Vector3& parentSize = parentSizeProperty.GetVector3();
- float height = mContentSize > parentSize.height ? parentSize.height * ( parentSize.height / mContentSize ) : parentSize.height * ( (parentSize.height - mContentSize * 0.5f) / parentSize.height);
- return Vector3( parentSize.width, std::max(MINIMUM_INDICATOR_HEIGHT, height), parentSize.depth );
- }
-
- float mContentSize; ///< The size of scrollable content
-};
+ float height = contentSize > parentSize.height ?
+ parentSize.height * ( parentSize.height / contentSize ) :
+ parentSize.height * ( (parentSize.height - contentSize * 0.5f) / parentSize.height);
+ return Vector3( parentSize.width, std::max(MINIMUM_INDICATOR_HEIGHT, height), parentSize.depth );
+}
/**
* Indicator position constraint
}
else
{
- constraint = Constraint::New<Vector3>( Actor::SIZE,
- ParentSource( Actor::SIZE ),
- IndicatorSizeConstraint( mScrollConnector.GetContentLength() ) );
- mIndicatorSizeConstraint = mIndicator.ApplyConstraint( constraint );
+ mIndicator.SetSize( IndicatorSize( Self().GetCurrentSize(), mScrollConnector.GetContentLength() ) );
}
if(mIndicatorPositionConstraint)
Source( mScrollPositionObject, Toolkit::ScrollConnector::SCROLL_POSITION ),
IndicatorPositionConstraint( mScrollConnector.GetMinLimit(), mScrollConnector.GetMaxLimit() ) );
mIndicatorPositionConstraint = mIndicator.ApplyConstraint( constraint );
-
- if( mBackground )
- {
- mBackground.RemoveConstraints();
-
- constraint = Constraint::New<Vector3>(Actor::SIZE,
- ParentSource(Actor::SIZE),
- EqualToConstraint());
- mBackground.ApplyConstraint(constraint);
- }
}
}
}
}
+void ScrollBar::OnControlSizeSet( const Vector3& size )
+{
+ if(mIndicatorHeightPolicy != Toolkit::ScrollBar::Fixed && mScrollConnector)
+ {
+ mIndicator.SetSize( IndicatorSize( size, mScrollConnector.GetContentLength() ) );
+ }
+}
+
void ScrollBar::OnScrollDomainChanged(float minPosition, float maxPosition, float contentSize)
{
// Reapply constraints when the scroll domain is changed
*/
virtual void OnPan( PanGesture gesture );
+ /**
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+ */
+ virtual void OnControlSizeSet( const Vector3& size );
+
private:
/**
Constrainable mScrollPositionObject; ///< From mScrollConnector
- ImageActor mBackground; ///< Background image of scroll bar.
ImageActor mIndicator; ///< Image of scroll indicator.
Animation mAnimation; ///< Scroll indicator Show/Hide Animation.
// EXTERNAL INCLUDES
#include <sstream>
-#include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/animation/time-period.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/scripting/scripting.h>
const float DEFAULT_CONSTRAINT_DURATION = 0.0f;
/**
- * Constraint that sets a child property relative to parents Width or Height
+ * sets a child property relative to parents size and applies a unit based padding before the relative calculation.
+ * @param[in] scale of parent minus padding between 0 and 1
+ * @param[in] padding in world coordinate units
+ * @param[in] fixed part in world coordinate units
+ * @param[in] size of the parent
+ * @return The relative size with padding.
*/
-struct RelativeToWidthOrHeight
+Vector2 RelativeToSize( const Vector2& scale, const Vector2& padding, const Vector2& fixed, const Vector2& parentSize)
{
- /**
- * Constraint that is relative (%) to parent width/height and applies a
- * unit based padding before the relative calculation.
- * @param scale of parent minus padding between 0 and 1
- * @param padding in world coordinate units
- * @param fixed part in world coordinate units
- */
- RelativeToWidthOrHeight( float scale, float padding, float fixed )
- : mScaleFactor( scale ),
- mPadding( padding ),
- mFixed( fixed )
- {
- }
-
- inline float operator()( const float& parentWidthOrHeight )
- {
- return mFixed + ( parentWidthOrHeight - mPadding ) * mScaleFactor;
- }
-
- float operator()( const float& current,
- const PropertyInput& parentWidthOrHeight )
- {
- return operator()( parentWidthOrHeight.GetFloat() );
- }
-
- float mScaleFactor;
- float mPadding;
- float mFixed;
-};
+ return fixed + ( parentSize - padding ) * scale;
+}
#if defined(DEBUG_ENABLED)
// debugging support, very useful when new features are added or bugs are hunted down
const Property::Index TableView::PROPERTY_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX );
const Property::Index TableView::PROPERTY_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 1 );
const Property::Index TableView::PROPERTY_CELL_PADDING( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 2 );
-const Property::Index TableView::PROPERTY_LAYOUT_ANIMATION_DURATION( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 3 );
-const Property::Index TableView::PROPERTY_LAYOUT_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 4 );
-const Property::Index TableView::PROPERTY_LAYOUT_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 5 );
+const Property::Index TableView::PROPERTY_LAYOUT_ROWS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 3 );
+const Property::Index TableView::PROPERTY_LAYOUT_COLUMNS( Internal::TableView::TABLEVIEW_PROPERTY_START_INDEX + 4 );
namespace Internal
{
PropertyRegistration property1( mType, "rows", Toolkit::TableView::PROPERTY_ROWS, Property::UNSIGNED_INTEGER, &TableView::SetProperty, &TableView::GetProperty );
PropertyRegistration property2( mType, "columns", Toolkit::TableView::PROPERTY_COLUMNS, Property::UNSIGNED_INTEGER, &TableView::SetProperty, &TableView::GetProperty );
PropertyRegistration property3( mType, "cell-padding", Toolkit::TableView::PROPERTY_CELL_PADDING, Property::VECTOR2, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property4( mType, "layout-animation-duration", Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, Property::FLOAT, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property5( mType, "layout-rows", Toolkit::TableView::PROPERTY_LAYOUT_ROWS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
-PropertyRegistration property6( mType, "layout-columns", Toolkit::TableView::PROPERTY_LAYOUT_COLUMNS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
+PropertyRegistration property4( mType, "layout-rows", Toolkit::TableView::PROPERTY_LAYOUT_ROWS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
+PropertyRegistration property5( mType, "layout-columns", Toolkit::TableView::PROPERTY_LAYOUT_COLUMNS, Property::MAP, &TableView::SetProperty, &TableView::GetProperty );
} // namespace
return mRelativeWidths[ columnIndex ];
}
-void TableView::SetLayoutAnimationDuration( float duration )
-{
- mConstraintDuration = duration;
-}
-
-float TableView::GetLayoutAnimationDuration()
-{
- return mConstraintDuration;
-}
-
void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container )
{
float fixedHeightsTotal = 0.0f;
Vector2 fixedPosition( ( colPos + 1.0f ) * mPadding.width + cumulatedFixedWidth,
( rowPos + 1.0f ) * mPadding.height + cumulatedFixedHeight );
- Constraint widthConstraint = Constraint::New<float>( Actor::POSITION_X,
- ParentSource( Actor::SIZE_WIDTH ),
- RelativeToWidthOrHeight( relativePosition.x, positionPadding.x, fixedPosition.x ) );
-
- Constraint heightConstraint = Constraint::New<float>( Actor::POSITION_Y,
- ParentSource( Actor::SIZE_HEIGHT ),
- RelativeToWidthOrHeight( relativePosition.y, positionPadding.y, fixedPosition.y ) );
-
- widthConstraint.SetApplyTime( mConstraintDuration );
- heightConstraint.SetApplyTime( mConstraintDuration );
-
- // bake constrained position value if constraint is removed
- widthConstraint.SetRemoveAction( Constraint::Bake );
- heightConstraint.SetRemoveAction( Constraint::Bake );
-
- actor.ApplyConstraint( widthConstraint );
- actor.ApplyConstraint( heightConstraint );
+ Vector3 actorPosition( RelativeToSize( relativePosition, positionPadding, fixedPosition, size ) );
+ actor.SetPosition( actorPosition );
// 2. set size
// constrain the actor size to be relative to the size of table
fixedSize.width += ( position.columnSpan - 1.0f ) * mPadding.width;
fixedSize.height += ( position.rowSpan - 1.0f ) * mPadding.height;
- RelativeToWidthOrHeight relativeWidthFunctor( relativeSize.x, sizePadding.x, fixedSize.x );
- RelativeToWidthOrHeight relativeHeightFunctor( relativeSize.y, sizePadding.y, fixedSize.y );
-
- widthConstraint = Constraint::New<float>( Actor::SIZE_WIDTH,
- ParentSource( Actor::SIZE_WIDTH ),
- relativeWidthFunctor );
-
- heightConstraint = Constraint::New<float>( Actor::SIZE_HEIGHT,
- ParentSource( Actor::SIZE_HEIGHT ),
- relativeHeightFunctor );
-
- widthConstraint.SetApplyTime( mConstraintDuration );
- heightConstraint.SetApplyTime( mConstraintDuration );
-
- // bake constrained size value if constraint is removed
- widthConstraint.SetRemoveAction( Constraint::Bake );
- heightConstraint.SetRemoveAction( Constraint::Bake );
-
- actor.ApplyConstraint( widthConstraint );
- actor.ApplyConstraint( heightConstraint );
+ Vector2 actorSize( RelativeToSize( relativeSize, sizePadding, fixedSize, size ) );
+ actor.SetSize(actorSize.x, actorSize.y);
// Relayout Children
- Relayout ( actor, Vector2( relativeWidthFunctor( size.width ), relativeHeightFunctor( size.height ) ), container );
+ Relayout ( actor, actorSize, container );
}
// for position we need to keep track of current fixed width and relative width
// increase for next column
tableViewImpl.SetCellPadding( value.Get<Vector2>() );
break;
}
- case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION:
- {
- tableViewImpl.SetLayoutAnimationDuration( value.Get<float>() );
- break;
- }
case Toolkit::TableView::PROPERTY_LAYOUT_ROWS:
{
SetHeightOrWidthProperty( tableViewImpl, &TableView::SetFixedHeight, &TableView::SetRelativeHeight, value );
value = tableViewImpl.GetCellPadding();
break;
}
- case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION:
- {
- value = tableViewImpl.GetLayoutAnimationDuration();
- break;
- }
case Toolkit::TableView::PROPERTY_LAYOUT_ROWS:
{
value = tableViewImpl.GetRowHeightsPropertyValue();
TableView::TableView( unsigned int initialRows, unsigned int initialColumns )
: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
mCellData( initialRows, initialColumns ),
- mLayoutingChild( false ),
- mConstraintDuration( DEFAULT_CONSTRAINT_DURATION )
+ mLayoutingChild( false )
{
SetKeyboardNavigationSupport( true );
ResizeContainers( initialRows, initialColumns );
float GetRelativeWidth( unsigned int columnIndex ) const;
/**
- * @copydoc Toolkit::TableView::SetLayoutAnimationDuration
- */
- void SetLayoutAnimationDuration( float duration );
-
- /**
- * @copydoc Toolkit::TableView::GetLayoutAnimationDuration
- */
- float GetLayoutAnimationDuration();
-
-
- /**
* @copydoc Toolkit::TableView::GetRows
*/
unsigned int GetRows();
std::vector<float> mRelativeWidths;
Size mPadding;
bool mLayoutingChild;
- float mConstraintDuration;
};
--- /dev/null
+# Add local source files here
+
+toolkit_src_files = \
+ $(toolkit_src_dir)/builder/builder-actor.cpp \
+ $(toolkit_src_dir)/builder/builder-animations.cpp \
+ $(toolkit_src_dir)/builder/builder-impl.cpp \
+ $(toolkit_src_dir)/builder/builder-set-property.cpp \
+ $(toolkit_src_dir)/builder/builder-signals.cpp \
+ $(toolkit_src_dir)/builder/json-parser-state.cpp \
+ $(toolkit_src_dir)/builder/json-parser-impl.cpp \
+ $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \
+ $(toolkit_src_dir)/builder/replacement.cpp \
+ $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
+ $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
+ $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/check-box-button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \
+ $(toolkit_src_dir)/controls/buttons/radio-button-impl.cpp \
+ $(toolkit_src_dir)/controls/cluster/cluster-impl.cpp \
+ $(toolkit_src_dir)/controls/cluster/cluster-style-impl.cpp \
+ $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \
+ $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
+ $(toolkit_src_dir)/controls/image-view/masked-image-view-impl.cpp \
+ $(toolkit_src_dir)/controls/magnifier/magnifier-impl.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
+ $(toolkit_src_dir)/controls/navigation-frame/page-impl.cpp \
+ $(toolkit_src_dir)/controls/popup/popup-impl.cpp \
+ $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
+ $(toolkit_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
+ $(toolkit_src_dir)/controls/relayout-controller-impl.cpp \
+ $(toolkit_src_dir)/controls/relayout-controller.cpp \
+ $(toolkit_src_dir)/controls/relayout-helper.cpp \
+ $(toolkit_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \
+ $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \
+ $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \
+ $(toolkit_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \
+ $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-connector-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \
+ $(toolkit_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
+ $(toolkit_src_dir)/controls/slider/slider-impl.cpp \
+ $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
+ $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-decorator-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-handles-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-popup-impl.cpp \
+ $(toolkit_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \
+ $(toolkit_src_dir)/controls/text-view/relayout-utilities.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-char-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/split-by-word-policies.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-actor-cache.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-character-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-impl.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor-dbg.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-processor.cpp \
+ $(toolkit_src_dir)/controls/text-view/text-view-word-processor.cpp \
+ $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
+ $(toolkit_src_dir)/controls/view/view-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \
+ $(toolkit_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \
+ $(toolkit_src_dir)/filters/blur-two-pass-filter.cpp \
+ $(toolkit_src_dir)/filters/emboss-filter.cpp \
+ $(toolkit_src_dir)/filters/image-filter.cpp \
+ $(toolkit_src_dir)/filters/spread-filter.cpp \
+ $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \
+ $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \
+ $(toolkit_src_dir)/styling/style-manager-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
+ $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp
+
return GetImpl(*this).GetRelativeWidth( columnIndex );
}
-void TableView::SetLayoutAnimationDuration( float duration )
-{
- GetImpl(*this).SetLayoutAnimationDuration( duration );
-}
-
-float TableView::GetLayoutAnimationDuration()
-{
- return GetImpl(*this).GetLayoutAnimationDuration();
-}
-
unsigned int TableView::GetRows()
{
return GetImpl(*this).GetRows();
static const Property::Index PROPERTY_ROWS; ///< name "rows", type UNSIGNED_INTEGER
static const Property::Index PROPERTY_COLUMNS; ///< name "columns", type UNSIGNED_INTEGER
static const Property::Index PROPERTY_CELL_PADDING; ///< name "cell-padding", type VECTOR2
- static const Property::Index PROPERTY_LAYOUT_ANIMATION_DURATION; ///< name "layout-animation-duration", type FLOAT
/*
* PROPERTY_LAYOUT_ROWS set the height of the rows
float GetRelativeWidth( unsigned int columnIndex ) const;
/**
- * Sets the layout animation duration for add, remove and relayout
- * @param duration for the layout animations
- * @note The default duration is 0.0f.
- */
- void SetLayoutAnimationDuration( float duration );
-
- /**
- * Gets the layout animation duration for add, remove and relayout
- * @return duration for the layout animations
- */
- float GetLayoutAnimationDuration();
-
- /**
* @return the amount of rows in the table
*/
unsigned int GetRows();
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 28;
+const unsigned int TOOLKIT_MICRO_VERSION = 29;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
--- /dev/null
+# Add local source files here
+
+public_api_src_files = \
+ $(public_api_src_dir)/builder/builder.cpp \
+ $(public_api_src_dir)/builder/json-parser.cpp \
+ $(public_api_src_dir)/builder/tree-node.cpp \
+ $(public_api_src_dir)/controls/control-impl.cpp \
+ $(public_api_src_dir)/controls/control.cpp \
+ $(public_api_src_dir)/controls/alignment/alignment.cpp \
+ $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
+ $(public_api_src_dir)/controls/buttons/button.cpp \
+ $(public_api_src_dir)/controls/buttons/check-box-button.cpp \
+ $(public_api_src_dir)/controls/buttons/push-button.cpp \
+ $(public_api_src_dir)/controls/buttons/radio-button.cpp \
+ $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \
+ $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \
+ $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-control.cpp \
+ $(public_api_src_dir)/controls/navigation-frame/page.cpp \
+ $(public_api_src_dir)/controls/magnifier/magnifier.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-factory.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \
+ $(public_api_src_dir)/controls/popup/popup.cpp \
+ $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-connector.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-component-impl.cpp \
+ $(public_api_src_dir)/controls/scrollable/scroll-component.cpp \
+ $(public_api_src_dir)/controls/scrollable/scrollable.cpp \
+ $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \
+ $(public_api_src_dir)/controls/slider/slider.cpp \
+ $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
+ $(public_api_src_dir)/controls/table-view/table-view.cpp \
+ $(public_api_src_dir)/controls/text-input/text-input.cpp \
+ $(public_api_src_dir)/controls/text-view/text-view.cpp \
+ $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \
+ $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \
+ $(public_api_src_dir)/controls/cluster/cluster-style.cpp \
+ $(public_api_src_dir)/controls/cluster/cluster.cpp \
+ $(public_api_src_dir)/controls/effects-view/effects-view.cpp \
+ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
+ $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
+ $(public_api_src_dir)/controls/view/view.cpp \
+ $(public_api_src_dir)/focus-manager/focus-manager.cpp \
+ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
+ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
+ $(public_api_src_dir)/markup-processor/markup-processor.cpp \
+ $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
+ $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bendy-effect.cpp \
+ $(public_api_src_dir)/shader-effects/blind-effect.cpp \
+ $(public_api_src_dir)/shader-effects/bouncing-effect.cpp \
+ $(public_api_src_dir)/shader-effects/carousel-effect.cpp \
+ $(public_api_src_dir)/shader-effects/displacement-effect.cpp \
+ $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \
+ $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \
+ $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \
+ $(public_api_src_dir)/shader-effects/image-region-effect.cpp \
+ $(public_api_src_dir)/shader-effects/iris-effect.cpp \
+ $(public_api_src_dir)/shader-effects/mask-effect.cpp \
+ $(public_api_src_dir)/shader-effects/mirror-effect.cpp \
+ $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \
+ $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \
+ $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
+ $(public_api_src_dir)/shader-effects/overlay-effect.cpp \
+ $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
+ $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \
+ $(public_api_src_dir)/shader-effects/ripple-effect.cpp \
+ $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \
+ $(public_api_src_dir)/shader-effects/shear-effect.cpp \
+ $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \
+ $(public_api_src_dir)/shader-effects/spot-effect.cpp \
+ $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \
+ $(public_api_src_dir)/shader-effects/swirl-effect.cpp \
+ $(public_api_src_dir)/shader-effects/water-effect.cpp \
+ $(public_api_src_dir)/styling/style-manager.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
+ $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
+ $(public_api_src_dir)/dali-toolkit-version.cpp \
+ $(public_api_src_dir)/enums.cpp
+
+# Add public header files here
+
+public_api_header_files = \
+ $(public_api_src_dir)/dali-toolkit-version.h \
+ $(public_api_src_dir)/enums.h
+
+public_api_builder_header_files = \
+ $(public_api_src_dir)/builder/builder.h \
+ $(public_api_src_dir)/builder/json-parser.h \
+ $(public_api_src_dir)/builder/tree-node.h
+
+public_api_controls_header_files = \
+ $(public_api_src_dir)/controls/control-impl.h \
+ $(public_api_src_dir)/controls/control.h
+
+public_api_alignment_header_files = \
+ $(public_api_src_dir)/controls/alignment/alignment.h
+
+public_api_buttons_header_files = \
+ $(public_api_src_dir)/controls/buttons/button.h \
+ $(public_api_src_dir)/controls/buttons/check-box-button.h \
+ $(public_api_src_dir)/controls/buttons/push-button.h \
+ $(public_api_src_dir)/controls/buttons/radio-button.h
+
+public_api_bloom_view_header_files = \
+ $(public_api_src_dir)/controls/bloom-view/bloom-view.h
+
+public_api_bubble_emitter_header_files = \
+ $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.h
+
+public_api_cluster_header_files = \
+ $(public_api_src_dir)/controls/cluster/cluster-style.h \
+ $(public_api_src_dir)/controls/cluster/cluster.h
+
+public_api_default_controls_header_files = \
+ $(public_api_src_dir)/controls/default-controls/check-button-factory.h \
+ $(public_api_src_dir)/controls/default-controls/push-button-factory.h \
+ $(public_api_src_dir)/controls/default-controls/solid-color-actor.h
+
+public_api_effects_view_header_files = \
+ $(public_api_src_dir)/controls/effects-view/effects-view.h
+
+public_api_gaussian_blur_view_header_files = \
+ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
+
+public_api_image_view_header_files = \
+ $(public_api_src_dir)/controls/image-view/masked-image-view.h
+
+public_api_item_view_header_files = \
+ $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/item-view.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \
+ $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h
+
+public_api_magnifier_header_files = \
+ $(public_api_src_dir)/controls/magnifier/magnifier.h
+
+public_api_page_turn_view_header_files = \
+ $(public_api_src_dir)/controls/page-turn-view/page-factory.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
+ $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h
+
+public_api_popup_header_files = \
+ $(public_api_src_dir)/controls/popup/popup.h
+
+public_api_scrollable_header_files = \
+ $(public_api_src_dir)/controls/scrollable/scroll-component-impl.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-component.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-connector.h \
+ $(public_api_src_dir)/controls/scrollable/scrollable.h
+
+public_api_scroll_bar_header_files = \
+ $(public_api_src_dir)/controls/scroll-bar/scroll-bar.h
+
+public_api_scroll_view_header_files = \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \
+ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h
+
+public_api_slider_header_files = \
+ $(public_api_src_dir)/controls/slider/slider.h
+
+public_api_shadow_view_header_files = \
+ $(public_api_src_dir)/controls/shadow-view/shadow-view.h
+
+public_api_super_blur_view_header_files = \
+ $(public_api_src_dir)/controls/super-blur-view/super-blur-view.h
+
+public_api_table_view_header_files = \
+ $(public_api_src_dir)/controls/table-view/table-view.h
+
+public_api_text_input_header_files = \
+ $(public_api_src_dir)/controls/text-input/text-input.h
+
+public_api_text_view_header_files = \
+ $(public_api_src_dir)/controls/text-view/text-view.h
+
+public_api_tool_bar_header_files = \
+ $(public_api_src_dir)/controls/tool-bar/tool-bar.h
+
+public_api_navigation_frame_header_files = \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-bar-style.h \
+ $(public_api_src_dir)/controls/navigation-frame/navigation-control.h \
+ $(public_api_src_dir)/controls/navigation-frame/page.h
+
+public_api_view_header_files = \
+ $(public_api_src_dir)/controls/view/view.h
+
+public_api_focus_manager_header_files = \
+ $(public_api_src_dir)/focus-manager/focus-manager.h \
+ $(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \
+ $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h
+
+public_api_markup_processor_header_files = \
+ $(public_api_src_dir)/markup-processor/markup-processor.h
+
+public_api_shader_effects_header_files = \
+ $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \
+ $(public_api_src_dir)/shader-effects/bendy-effect.h \
+ $(public_api_src_dir)/shader-effects/blind-effect.h \
+ $(public_api_src_dir)/shader-effects/bouncing-effect.h \
+ $(public_api_src_dir)/shader-effects/carousel-effect.h \
+ $(public_api_src_dir)/shader-effects/displacement-effect.h \
+ $(public_api_src_dir)/shader-effects/dissolve-effect.h \
+ $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \
+ $(public_api_src_dir)/shader-effects/distance-field-effect.h \
+ $(public_api_src_dir)/shader-effects/image-region-effect.h \
+ $(public_api_src_dir)/shader-effects/iris-effect.h \
+ $(public_api_src_dir)/shader-effects/mask-effect.h \
+ $(public_api_src_dir)/shader-effects/mirror-effect.h \
+ $(public_api_src_dir)/shader-effects/motion-blur-effect.h \
+ $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \
+ $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.h \
+ $(public_api_src_dir)/shader-effects/overlay-effect.h \
+ $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \
+ $(public_api_src_dir)/shader-effects/page-turn-effect.h \
+ $(public_api_src_dir)/shader-effects/ripple-effect.h \
+ $(public_api_src_dir)/shader-effects/ripple2d-effect.h \
+ $(public_api_src_dir)/shader-effects/shear-effect.h \
+ $(public_api_src_dir)/shader-effects/soft-button-effect.h \
+ $(public_api_src_dir)/shader-effects/spot-effect.h \
+ $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \
+ $(public_api_src_dir)/shader-effects/swirl-effect.h \
+ $(public_api_src_dir)/shader-effects/water-effect.h
+
+public_api_bubble_effect_header_files = \
+ $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
+ $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h
+
+public_api_styling_header_files = \
+ $(public_api_src_dir)/styling/style-manager.h
+
+public_api_transition_effects_header_files = \
+ $(public_api_src_dir)/transition-effects/cube-transition-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h \
+ $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h
+
--- /dev/null
+# Files to install here
+
+dali_toolkit_sound_files =\
+ $(toolkit_sounds_dir)/*.ogg
# Files to install here
dali_toolkit_style_files =\
- $(toolkit_base_styles_dir)/*.json
+ $(toolkit_styles_dir)/*.json
+++ /dev/null
-# Files to install here
-
-dali_toolkit_optional_image_files =\
- $(toolkit_optional_images_dir)/*.png
+++ /dev/null
-# Add local source files here
-
-toolkit_optional_src_files = \
- $(toolkit_optional_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/cluster/cluster-impl.cpp \
- $(toolkit_optional_src_dir)/controls/cluster/cluster-style-impl.cpp \
- $(toolkit_optional_src_dir)/controls/effects-view/effects-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/image-view/masked-image-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/shadow-view/shadow-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/slider/slider-impl.cpp \
- $(toolkit_optional_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \
- $(toolkit_optional_src_dir)/controls/tool-bar/tool-bar-impl.cpp \
- $(toolkit_optional_src_dir)/controls/view/view-impl.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \
- $(toolkit_optional_src_dir)/controls/navigation-frame/page-impl.cpp \
- $(toolkit_optional_src_dir)/filters/blur-two-pass-filter.cpp \
- $(toolkit_optional_src_dir)/filters/emboss-filter.cpp \
- $(toolkit_optional_src_dir)/filters/image-filter.cpp \
- $(toolkit_optional_src_dir)/filters/spread-filter.cpp \
- $(toolkit_optional_src_dir)/shader-effects/water-effect-impl.cpp \
- $(toolkit_optional_src_dir)/shader-effects/page-turn-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \
- $(toolkit_optional_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \
- $(toolkit_optional_src_dir)/controls/magnifier/magnifier-impl.cpp
+++ /dev/null
-# Add local source files here
-
-public_api_optional_src_files = \
- $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.cpp \
- $(public_api_optional_src_dir)/controls/cluster/cluster.cpp \
- $(public_api_optional_src_dir)/controls/cluster/cluster-style.cpp \
- $(public_api_optional_src_dir)/controls/effects-view/effects-view.cpp \
- $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
- $(public_api_optional_src_dir)/controls/image-view/masked-image-view.cpp \
- $(public_api_optional_src_dir)/controls/magnifier/magnifier.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
- $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.cpp \
- $(public_api_optional_src_dir)/controls/slider/slider.cpp \
- $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.cpp \
- $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.cpp \
- $(public_api_optional_src_dir)/controls/view/view.cpp \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.cpp \
- $(public_api_optional_src_dir)/controls/navigation-frame/page.cpp \
- $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.cpp \
- $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bendy-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/blind-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/carousel-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/displacement-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/dissolve-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/distance-field-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/iris-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/mask-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/mirror-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/nine-patch-mask-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/overlay-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/page-turn-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/ripple-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/ripple2d-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/shear-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/soft-button-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/spot-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/swirl-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/water-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
- $(public_api_optional_src_dir)/dali-toolkit-version.cpp
-
-# Add public header files here
-
-public_api_optional_header_files = \
- $(public_api_optional_src_dir)/dali-toolkit-version.h
-
-public_api_optional_controls_header_files =
-
-public_api_optional_bubble_emitter_header_files = \
- $(public_api_optional_src_dir)/controls/bubble-effect/bubble-emitter.h
-
-public_api_optional_bloom_view_header_files = \
- $(public_api_optional_src_dir)/controls/bloom-view/bloom-view.h
-
-public_api_optional_cluster_header_files = \
- $(public_api_optional_src_dir)/controls/cluster/cluster.h \
- $(public_api_optional_src_dir)/controls/cluster/cluster-style.h
-
-public_api_optional_effects_view_header_files = \
- $(public_api_optional_src_dir)/controls/effects-view/effects-view.h
-
-public_api_optional_gaussian_blur_view_header_files = \
- $(public_api_optional_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h
-
-public_api_optional_image_view_header_files = \
- $(public_api_optional_src_dir)/controls/image-view/masked-image-view.h
-
-public_api_optional_magnifier_header_files = \
- $(public_api_optional_src_dir)/controls/magnifier/magnifier.h
-
-public_api_optional_page_turn_view_header_files = \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-view.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-factory.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \
- $(public_api_optional_src_dir)/controls/page-turn-view/page-turn-landscape-view.h
-
-public_api_optional_slider_header_files = \
- $(public_api_optional_src_dir)/controls/slider/slider.h
-
-public_api_optional_shadow_view_header_files = \
- $(public_api_optional_src_dir)/controls/shadow-view/shadow-view.h
-
-public_api_optional_super_blur_view_header_files = \
- $(public_api_optional_src_dir)/controls/super-blur-view/super-blur-view.h
-
-public_api_optional_tool_bar_header_files = \
- $(public_api_optional_src_dir)/controls/tool-bar/tool-bar.h
-
-public_api_optional_view_header_files = \
- $(public_api_optional_src_dir)/controls/view/view.h
-
-public_api_optional_navigation_frame_header_files = \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-control.h \
- $(public_api_optional_src_dir)/controls/navigation-frame/page.h \
- $(public_api_optional_src_dir)/controls/navigation-frame/navigation-bar-style.h
-
-public_api_optional_markup_processor_header_files =
-
-public_api_optional_shader_effects_header_files = \
- $(public_api_optional_src_dir)/shader-effects/alpha-discard-effect.h \
- $(public_api_optional_src_dir)/shader-effects/bendy-effect.h \
- $(public_api_optional_src_dir)/shader-effects/blind-effect.h \
- $(public_api_optional_src_dir)/shader-effects/carousel-effect.h \
- $(public_api_optional_src_dir)/shader-effects/displacement-effect.h \
- $(public_api_optional_src_dir)/shader-effects/dissolve-local-effect.h \
- $(public_api_optional_src_dir)/shader-effects/distance-field-effect.h \
- $(public_api_optional_src_dir)/shader-effects/mirror-effect.h \
- $(public_api_optional_src_dir)/shader-effects/motion-blur-effect.h \
- $(public_api_optional_src_dir)/shader-effects/motion-stretch-effect.h \
- $(public_api_optional_src_dir)/shader-effects/overlay-effect.h \
- $(public_api_optional_src_dir)/shader-effects/shear-effect.h \
- $(public_api_optional_src_dir)/shader-effects/soft-button-effect.h \
- $(public_api_optional_src_dir)/shader-effects/spot-effect.h \
- $(public_api_optional_src_dir)/shader-effects/square-dissolve-effect.h \
- $(public_api_optional_src_dir)/shader-effects/water-effect.h
-
-public_api_optional_bubble_effect_header_files = \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/bubble-effect.h \
- $(public_api_optional_src_dir)/shader-effects/bubble-effect/color-adjuster.h
-
-public_api_optional_transition_effects_header_files = \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-wave-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-cross-effect.h \
- $(public_api_optional_src_dir)/transition-effects/cube-transition-fold-effect.h
-
Name: dali-toolkit
Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.0.28
+Version: 1.0.29
Release: 1
Group: System/Libraries
License: Apache-2.0
projects / platform / core / uifw / dali-toolkit.git / commitdiff
