From: Kimmo Hoikka Date: Thu, 12 Feb 2015 10:42:42 +0000 (-0800) Subject: Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen X-Git-Tag: submit/tizen/20150217.020310~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=57869973578f6a0b0f836d396c7232ddb8302c6b;hp=47602d95266454026fab0b4fb9c745a1c342c5c3 Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen --- diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt index 227f4af..5a88e73 100644 --- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt @@ -55,8 +55,7 @@ ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS}) INCLUDE_DIRECTORIES( ${${CAPI_LIB}_INCLUDE_DIRS} ../dali-toolkit/dali-toolkit-test-utils - ../../../base - ../../../optional + ../../../ ) ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES}) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp index 7fe943a..b32c92e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp @@ -39,7 +39,6 @@ namespace 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"; @@ -74,8 +73,7 @@ static void SetupTableViewAndActors(TableView& tableView, Actor& actor1, Actor& DALI_TEST_CHECK(tableView); Stage::GetCurrent().Add( tableView ); - tableView.ApplyConstraint( Constraint::New( Actor::SIZE, Constraint100() ) ); - tableView.SetLayoutAnimationDuration(0.0f); + tableView.SetSize( Dali::Vector3( 100.0f, 100.0f, 100.0f ) ); actor1 = Actor::New(); actor2 = Actor::New(); @@ -220,23 +218,6 @@ int UtcDaliTableViewMetricsRelative(void) } -// 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) { @@ -585,14 +566,6 @@ int UtcDaliTableViewSetGetProperty(void) DALI_TEST_EQUALS( tableView.GetCellPadding(), Size(6.f, 8.f), TEST_LOCATION ); DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_CELL_PADDING).Get(), 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(), 1.5f, TEST_LOCATION ); - //{ "policy": "fixed", "value": 30.0 }, Property::Map item1; item1[ "policy" ] = "fixed"; diff --git a/base/dali-toolkit/images/file.list b/base/dali-toolkit/images/file.list deleted file mode 100644 index 2eec674..0000000 --- a/base/dali-toolkit/images/file.list +++ /dev/null @@ -1,4 +0,0 @@ -# Files to install here - -dali_toolkit_base_image_files =\ - $(toolkit_base_images_dir)/*.png diff --git a/base/dali-toolkit/internal/file.list b/base/dali-toolkit/internal/file.list deleted file mode 100644 index 1966d8d..0000000 --- a/base/dali-toolkit/internal/file.list +++ /dev/null @@ -1,67 +0,0 @@ -# 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 diff --git a/base/dali-toolkit/public-api/file.list b/base/dali-toolkit/public-api/file.list deleted file mode 100755 index 9537d61..0000000 --- a/base/dali-toolkit/public-api/file.list +++ /dev/null @@ -1,148 +0,0 @@ -# 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 - diff --git a/base/dali-toolkit/sounds/file.list b/base/dali-toolkit/sounds/file.list deleted file mode 100644 index 74ee1c1..0000000 --- a/base/dali-toolkit/sounds/file.list +++ /dev/null @@ -1,4 +0,0 @@ -# Files to install here - -dali_toolkit_base_sound_files =\ - $(toolkit_base_sounds_dir)/*.ogg diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index 454053f..4c4afda 100644 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -61,10 +61,6 @@ AC_ARG_ENABLE([profile], [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 diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 86111b2..aab631d 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -16,74 +16,44 @@ # 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) \ @@ -98,94 +68,84 @@ libdali_toolkit_la_LIBADD = \ $(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) diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in index 33e5418..92ff833 100644 --- a/build/tizen/docs/dali.doxy.in +++ b/build/tizen/docs/dali.doxy.in @@ -754,8 +754,7 @@ WARN_LOGFILE = # 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 diff --git a/optional/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h similarity index 98% rename from optional/dali-toolkit/dali-toolkit.h rename to dali-toolkit/dali-toolkit.h index 91bdcca..942e62d 100644 --- a/optional/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -1,5 +1,5 @@ -#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. @@ -23,85 +23,68 @@ // Toolkit #include +#include +#include #include +#include #include #include #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// INTERNAL INCLUDES - -#include -#include -#include -#include - #include - +#include +#include #include #include +#include #include +#include +#include +#include #include -#include #include -#include - +#include +#include #include #include #include +#include #include +#include +#include +#include +#include #include #include #include #include #include +#include #include +#include #include #include +#include #include +#include +#include #include #include +#include #include +#include +#include #include #include -#include -#include - +#include +#include #include +#include + #include #include #include @@ -121,6 +104,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -128,5 +121,6 @@ #include #include +#include -#endif // __DALI_TOOLKIT_EXT_H__ +#endif // __DALI_TOOLKIT_H__ diff --git a/base/dali-toolkit/images/00_popup_bg.png b/dali-toolkit/images/00_popup_bg.png similarity index 100% rename from base/dali-toolkit/images/00_popup_bg.png rename to dali-toolkit/images/00_popup_bg.png diff --git a/optional/dali-toolkit/images/00_popup_bottom_bg.png b/dali-toolkit/images/00_popup_bottom_bg.png similarity index 100% rename from optional/dali-toolkit/images/00_popup_bottom_bg.png rename to dali-toolkit/images/00_popup_bottom_bg.png diff --git a/optional/dali-toolkit/images/00_popup_bubble_bg.png b/dali-toolkit/images/00_popup_bubble_bg.png similarity index 100% rename from optional/dali-toolkit/images/00_popup_bubble_bg.png rename to dali-toolkit/images/00_popup_bubble_bg.png diff --git a/optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png b/dali-toolkit/images/00_popup_bubble_tail_bottom.png similarity index 100% rename from optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png rename to dali-toolkit/images/00_popup_bubble_tail_bottom.png diff --git a/base/dali-toolkit/images/00_popup_button_bg.png b/dali-toolkit/images/00_popup_button_bg.png similarity index 100% rename from base/dali-toolkit/images/00_popup_button_bg.png rename to dali-toolkit/images/00_popup_button_bg.png diff --git a/optional/dali-toolkit/images/00_popup_button_pressed.png b/dali-toolkit/images/00_popup_button_pressed.png similarity index 100% rename from optional/dali-toolkit/images/00_popup_button_pressed.png rename to dali-toolkit/images/00_popup_button_pressed.png diff --git a/base/dali-toolkit/images/B16-8_TTS_focus.png b/dali-toolkit/images/B16-8_TTS_focus.png similarity index 100% rename from base/dali-toolkit/images/B16-8_TTS_focus.png rename to dali-toolkit/images/B16-8_TTS_focus.png diff --git a/base/dali-toolkit/images/copy_paste_icon_clipboard.png b/dali-toolkit/images/copy_paste_icon_clipboard.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_clipboard.png rename to dali-toolkit/images/copy_paste_icon_clipboard.png diff --git a/base/dali-toolkit/images/copy_paste_icon_copy.png b/dali-toolkit/images/copy_paste_icon_copy.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_copy.png rename to dali-toolkit/images/copy_paste_icon_copy.png diff --git a/base/dali-toolkit/images/copy_paste_icon_cut.png b/dali-toolkit/images/copy_paste_icon_cut.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_cut.png rename to dali-toolkit/images/copy_paste_icon_cut.png diff --git a/base/dali-toolkit/images/copy_paste_icon_paste.png b/dali-toolkit/images/copy_paste_icon_paste.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_paste.png rename to dali-toolkit/images/copy_paste_icon_paste.png diff --git a/base/dali-toolkit/images/copy_paste_icon_select.png b/dali-toolkit/images/copy_paste_icon_select.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_select.png rename to dali-toolkit/images/copy_paste_icon_select.png diff --git a/base/dali-toolkit/images/copy_paste_icon_select_all.png b/dali-toolkit/images/copy_paste_icon_select_all.png similarity index 100% rename from base/dali-toolkit/images/copy_paste_icon_select_all.png rename to dali-toolkit/images/copy_paste_icon_select_all.png diff --git a/dali-toolkit/images/file.list b/dali-toolkit/images/file.list new file mode 100644 index 0000000..dbc5012 --- /dev/null +++ b/dali-toolkit/images/file.list @@ -0,0 +1,4 @@ +# Files to install here + +dali_toolkit_image_files =\ + $(toolkit_images_dir)/*.png diff --git a/base/dali-toolkit/images/insertpoint-icon.png b/dali-toolkit/images/insertpoint-icon.png similarity index 100% rename from base/dali-toolkit/images/insertpoint-icon.png rename to dali-toolkit/images/insertpoint-icon.png diff --git a/base/dali-toolkit/images/keyboard_focus.png b/dali-toolkit/images/keyboard_focus.png similarity index 100% rename from base/dali-toolkit/images/keyboard_focus.png rename to dali-toolkit/images/keyboard_focus.png diff --git a/optional/dali-toolkit/images/magnifier-image-frame.png b/dali-toolkit/images/magnifier-image-frame.png similarity index 100% rename from optional/dali-toolkit/images/magnifier-image-frame.png rename to dali-toolkit/images/magnifier-image-frame.png diff --git a/optional/dali-toolkit/images/magnifier.png b/dali-toolkit/images/magnifier.png similarity index 100% rename from optional/dali-toolkit/images/magnifier.png rename to dali-toolkit/images/magnifier.png diff --git a/base/dali-toolkit/images/popup_bg.png b/dali-toolkit/images/popup_bg.png similarity index 100% rename from base/dali-toolkit/images/popup_bg.png rename to dali-toolkit/images/popup_bg.png diff --git a/base/dali-toolkit/images/popup_bubble_bg.#.png b/dali-toolkit/images/popup_bubble_bg.#.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_bg.#.png rename to dali-toolkit/images/popup_bubble_bg.#.png diff --git a/base/dali-toolkit/images/popup_bubble_bg_ef.#.png b/dali-toolkit/images/popup_bubble_bg_ef.#.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_bg_ef.#.png rename to dali-toolkit/images/popup_bubble_bg_ef.#.png diff --git a/base/dali-toolkit/images/popup_bubble_bg_line.#.png b/dali-toolkit/images/popup_bubble_bg_line.#.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_bg_line.#.png rename to dali-toolkit/images/popup_bubble_bg_line.#.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_bottom.png b/dali-toolkit/images/popup_bubble_tail_bottom.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_bottom.png rename to dali-toolkit/images/popup_bubble_tail_bottom.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_bottom_ef.png b/dali-toolkit/images/popup_bubble_tail_bottom_ef.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_bottom_ef.png rename to dali-toolkit/images/popup_bubble_tail_bottom_ef.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_bottom_line.png b/dali-toolkit/images/popup_bubble_tail_bottom_line.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_bottom_line.png rename to dali-toolkit/images/popup_bubble_tail_bottom_line.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_top.png b/dali-toolkit/images/popup_bubble_tail_top.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_top.png rename to dali-toolkit/images/popup_bubble_tail_top.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_top_ef.png b/dali-toolkit/images/popup_bubble_tail_top_ef.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_top_ef.png rename to dali-toolkit/images/popup_bubble_tail_top_ef.png diff --git a/base/dali-toolkit/images/popup_bubble_tail_top_line.png b/dali-toolkit/images/popup_bubble_tail_top_line.png similarity index 100% rename from base/dali-toolkit/images/popup_bubble_tail_top_line.png rename to dali-toolkit/images/popup_bubble_tail_top_line.png diff --git a/optional/dali-toolkit/images/popup_scroll.png b/dali-toolkit/images/popup_scroll.png similarity index 100% rename from optional/dali-toolkit/images/popup_scroll.png rename to dali-toolkit/images/popup_scroll.png diff --git a/optional/dali-toolkit/images/popup_tail_down.png b/dali-toolkit/images/popup_tail_down.png similarity index 100% rename from optional/dali-toolkit/images/popup_tail_down.png rename to dali-toolkit/images/popup_tail_down.png diff --git a/optional/dali-toolkit/images/popup_tail_left.png b/dali-toolkit/images/popup_tail_left.png similarity index 100% rename from optional/dali-toolkit/images/popup_tail_left.png rename to dali-toolkit/images/popup_tail_left.png diff --git a/optional/dali-toolkit/images/popup_tail_right.png b/dali-toolkit/images/popup_tail_right.png similarity index 100% rename from optional/dali-toolkit/images/popup_tail_right.png rename to dali-toolkit/images/popup_tail_right.png diff --git a/optional/dali-toolkit/images/popup_tail_up.png b/dali-toolkit/images/popup_tail_up.png similarity index 100% rename from optional/dali-toolkit/images/popup_tail_up.png rename to dali-toolkit/images/popup_tail_up.png diff --git a/base/dali-toolkit/images/radio-button-selected.png b/dali-toolkit/images/radio-button-selected.png similarity index 100% rename from base/dali-toolkit/images/radio-button-selected.png rename to dali-toolkit/images/radio-button-selected.png diff --git a/base/dali-toolkit/images/radio-button-unselected.png b/dali-toolkit/images/radio-button-unselected.png similarity index 100% rename from base/dali-toolkit/images/radio-button-unselected.png rename to dali-toolkit/images/radio-button-unselected.png diff --git a/optional/dali-toolkit/images/slider-popup-arrow.png b/dali-toolkit/images/slider-popup-arrow.png similarity index 100% rename from optional/dali-toolkit/images/slider-popup-arrow.png rename to dali-toolkit/images/slider-popup-arrow.png diff --git a/optional/dali-toolkit/images/slider-popup.9.png b/dali-toolkit/images/slider-popup.9.png similarity index 100% rename from optional/dali-toolkit/images/slider-popup.9.png rename to dali-toolkit/images/slider-popup.9.png diff --git a/optional/dali-toolkit/images/slider-popup.png b/dali-toolkit/images/slider-popup.png similarity index 100% rename from optional/dali-toolkit/images/slider-popup.png rename to dali-toolkit/images/slider-popup.png diff --git a/optional/dali-toolkit/images/slider-skin-handle.png b/dali-toolkit/images/slider-skin-handle.png similarity index 100% rename from optional/dali-toolkit/images/slider-skin-handle.png rename to dali-toolkit/images/slider-skin-handle.png diff --git a/optional/dali-toolkit/images/slider-skin-progress.9.png b/dali-toolkit/images/slider-skin-progress.9.png similarity index 100% rename from optional/dali-toolkit/images/slider-skin-progress.9.png rename to dali-toolkit/images/slider-skin-progress.9.png diff --git a/optional/dali-toolkit/images/slider-skin-progress.png b/dali-toolkit/images/slider-skin-progress.png similarity index 100% rename from optional/dali-toolkit/images/slider-skin-progress.png rename to dali-toolkit/images/slider-skin-progress.png diff --git a/optional/dali-toolkit/images/slider-skin.9.png b/dali-toolkit/images/slider-skin.9.png similarity index 100% rename from optional/dali-toolkit/images/slider-skin.9.png rename to dali-toolkit/images/slider-skin.9.png diff --git a/optional/dali-toolkit/images/slider-skin.png b/dali-toolkit/images/slider-skin.png similarity index 100% rename from optional/dali-toolkit/images/slider-skin.png rename to dali-toolkit/images/slider-skin.png diff --git a/base/dali-toolkit/images/text-input-selection-handle-left-press.png b/dali-toolkit/images/text-input-selection-handle-left-press.png similarity index 100% rename from base/dali-toolkit/images/text-input-selection-handle-left-press.png rename to dali-toolkit/images/text-input-selection-handle-left-press.png diff --git a/base/dali-toolkit/images/text-input-selection-handle-left.png b/dali-toolkit/images/text-input-selection-handle-left.png similarity index 100% rename from base/dali-toolkit/images/text-input-selection-handle-left.png rename to dali-toolkit/images/text-input-selection-handle-left.png diff --git a/base/dali-toolkit/images/text-input-selection-handle-right-press.png b/dali-toolkit/images/text-input-selection-handle-right-press.png similarity index 100% rename from base/dali-toolkit/images/text-input-selection-handle-right-press.png rename to dali-toolkit/images/text-input-selection-handle-right-press.png diff --git a/base/dali-toolkit/images/text-input-selection-handle-right.png b/dali-toolkit/images/text-input-selection-handle-right.png similarity index 100% rename from base/dali-toolkit/images/text-input-selection-handle-right.png rename to dali-toolkit/images/text-input-selection-handle-right.png diff --git a/base/dali-toolkit/internal/builder/builder-actor.cpp b/dali-toolkit/internal/builder/builder-actor.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/builder-actor.cpp rename to dali-toolkit/internal/builder/builder-actor.cpp diff --git a/base/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/builder-animations.cpp rename to dali-toolkit/internal/builder/builder-animations.cpp diff --git a/base/dali-toolkit/internal/builder/builder-declarations.h b/dali-toolkit/internal/builder/builder-declarations.h similarity index 100% rename from base/dali-toolkit/internal/builder/builder-declarations.h rename to dali-toolkit/internal/builder/builder-declarations.h diff --git a/base/dali-toolkit/internal/builder/builder-filesystem.h b/dali-toolkit/internal/builder/builder-filesystem.h similarity index 100% rename from base/dali-toolkit/internal/builder/builder-filesystem.h rename to dali-toolkit/internal/builder/builder-filesystem.h diff --git a/base/dali-toolkit/internal/builder/builder-get-is.inl.h b/dali-toolkit/internal/builder/builder-get-is.inl.h similarity index 100% rename from base/dali-toolkit/internal/builder/builder-get-is.inl.h rename to dali-toolkit/internal/builder/builder-get-is.inl.h diff --git a/base/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/builder-impl.cpp rename to dali-toolkit/internal/builder/builder-impl.cpp diff --git a/base/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h similarity index 100% rename from base/dali-toolkit/internal/builder/builder-impl.h rename to dali-toolkit/internal/builder/builder-impl.h diff --git a/base/dali-toolkit/internal/builder/builder-set-property.cpp b/dali-toolkit/internal/builder/builder-set-property.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/builder-set-property.cpp rename to dali-toolkit/internal/builder/builder-set-property.cpp diff --git a/base/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/builder-signals.cpp rename to dali-toolkit/internal/builder/builder-signals.cpp diff --git a/base/dali-toolkit/internal/builder/json-parser-impl.cpp b/dali-toolkit/internal/builder/json-parser-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/json-parser-impl.cpp rename to dali-toolkit/internal/builder/json-parser-impl.cpp diff --git a/base/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h similarity index 100% rename from base/dali-toolkit/internal/builder/json-parser-impl.h rename to dali-toolkit/internal/builder/json-parser-impl.h diff --git a/base/dali-toolkit/internal/builder/json-parser-state.cpp b/dali-toolkit/internal/builder/json-parser-state.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/json-parser-state.cpp rename to dali-toolkit/internal/builder/json-parser-state.cpp diff --git a/base/dali-toolkit/internal/builder/json-parser-state.h b/dali-toolkit/internal/builder/json-parser-state.h similarity index 100% rename from base/dali-toolkit/internal/builder/json-parser-state.h rename to dali-toolkit/internal/builder/json-parser-state.h diff --git a/base/dali-toolkit/internal/builder/optional-value.h b/dali-toolkit/internal/builder/optional-value.h similarity index 100% rename from base/dali-toolkit/internal/builder/optional-value.h rename to dali-toolkit/internal/builder/optional-value.h diff --git a/base/dali-toolkit/internal/builder/replacement.cpp b/dali-toolkit/internal/builder/replacement.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/replacement.cpp rename to dali-toolkit/internal/builder/replacement.cpp diff --git a/base/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h similarity index 100% rename from base/dali-toolkit/internal/builder/replacement.h rename to dali-toolkit/internal/builder/replacement.h diff --git a/base/dali-toolkit/internal/builder/tree-node-manipulator.cpp b/dali-toolkit/internal/builder/tree-node-manipulator.cpp similarity index 100% rename from base/dali-toolkit/internal/builder/tree-node-manipulator.cpp rename to dali-toolkit/internal/builder/tree-node-manipulator.cpp diff --git a/base/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h similarity index 100% rename from base/dali-toolkit/internal/builder/tree-node-manipulator.h rename to dali-toolkit/internal/builder/tree-node-manipulator.h diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp similarity index 84% rename from base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp rename to dali-toolkit/internal/controls/alignment/alignment-impl.cpp index e887cb4..97b6f64 100644 --- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp +++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp @@ -301,60 +301,65 @@ struct PositionConstraint 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; @@ -364,15 +369,6 @@ struct PositionConstraint 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( 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 ) @@ -486,61 +482,51 @@ void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container ) 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: @@ -550,7 +536,15 @@ void Alignment::OnRelayout( const Vector2& size, ActorSizeContainer& container ) } } - 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 ); } } diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/alignment/alignment-impl.h rename to dali-toolkit/internal/controls/alignment/alignment-impl.h diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp rename to dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h rename to dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp rename to dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h rename to dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/button-impl.cpp rename to dali-toolkit/internal/controls/buttons/button-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/button-impl.h b/dali-toolkit/internal/controls/buttons/button-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/button-impl.h rename to dali-toolkit/internal/controls/buttons/button-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/button-painter-impl.h b/dali-toolkit/internal/controls/buttons/button-painter-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/button-painter-impl.h rename to dali-toolkit/internal/controls/buttons/button-painter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp rename to dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h rename to dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp rename to dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h rename to dali-toolkit/internal/controls/buttons/check-box-button-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h rename to dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp rename to dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h b/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h rename to dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp rename to dali-toolkit/internal/controls/buttons/push-button-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/push-button-impl.h rename to dali-toolkit/internal/controls/buttons/push-button-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h b/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h rename to dali-toolkit/internal/controls/buttons/push-button-painter-impl.h diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp rename to dali-toolkit/internal/controls/buttons/radio-button-impl.cpp diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/buttons/radio-button-impl.h rename to dali-toolkit/internal/controls/buttons/radio-button-impl.h diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp b/dali-toolkit/internal/controls/cluster/cluster-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp rename to dali-toolkit/internal/controls/cluster/cluster-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/dali-toolkit/internal/controls/cluster/cluster-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/cluster/cluster-impl.h rename to dali-toolkit/internal/controls/cluster/cluster-impl.h diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp b/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp rename to dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h b/dali-toolkit/internal/controls/cluster/cluster-style-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h rename to dali-toolkit/internal/controls/cluster/cluster-style-impl.h diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp rename to dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h rename to dali-toolkit/internal/controls/effects-view/effects-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp rename to dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h rename to dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp rename to dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h rename to dali-toolkit/internal/controls/image-view/masked-image-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp rename to dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h rename to dali-toolkit/internal/controls/magnifier/magnifier-impl.h diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp rename to dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h rename to dali-toolkit/internal/controls/navigation-frame/navigation-bar.h diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp rename to dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h b/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h rename to dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp rename to dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h rename to dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp rename to dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h rename to dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp rename to dali-toolkit/internal/controls/navigation-frame/page-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h b/dali-toolkit/internal/controls/navigation-frame/page-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h rename to dali-toolkit/internal/controls/navigation-frame/page-impl.h diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp rename to dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h rename to dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp rename to dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h rename to dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp rename to dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h rename to dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp similarity index 91% rename from base/dali-toolkit/internal/controls/popup/popup-impl.cpp rename to dali-toolkit/internal/controls/popup/popup-impl.cpp index 1134b6e..83ea7eb 100755 --- a/base/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -55,78 +55,39 @@ const Vector3 DEFAULT_BOTTOM_SIZE = Vector3(1.0f, 0.2f, 0.0f); 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 @@ -199,13 +160,11 @@ void Popup::OnInitialize() mLayer.SetParentOrigin(ParentOrigin::CENTER); mLayer.SetAnchorPoint(AnchorPoint::CENTER); mLayer.RaiseToTop(); - mLayer.ApplyConstraint( Constraint::New( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); self.Add(mLayer); mPopupBg = Actor::New(); mPopupBg.SetParentOrigin(ParentOrigin::CENTER); mPopupBg.SetAnchorPoint(AnchorPoint::CENTER); - mPopupBg.ApplyConstraint( Constraint::New( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); mLayer.Add(mPopupBg); // Any content after this point which is added to Self() will be reparented to @@ -666,6 +625,23 @@ void Popup::OnControlChildAdd( Actor& child ) } } +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 @@ -683,13 +659,7 @@ void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container ) if( mBackgroundImage ) { - Constraint constraint = Constraint::New( 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 ); @@ -704,13 +674,7 @@ void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container ) } else { - Constraint constraint = Constraint::New( 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 ); @@ -865,6 +829,11 @@ Vector3 Popup::GetNaturalSize() 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; } diff --git a/base/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h similarity index 98% rename from base/dali-toolkit/internal/controls/popup/popup-impl.h rename to dali-toolkit/internal/controls/popup/popup-impl.h index b716c09..b6ee02b 100755 --- a/base/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -251,7 +251,12 @@ private: 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 ); diff --git a/base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp b/dali-toolkit/internal/controls/popup/popup-style-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp rename to dali-toolkit/internal/controls/popup/popup-style-impl.cpp diff --git a/base/dali-toolkit/internal/controls/popup/popup-style-impl.h b/dali-toolkit/internal/controls/popup/popup-style-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/popup/popup-style-impl.h rename to dali-toolkit/internal/controls/popup/popup-style-impl.h diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.cpp b/dali-toolkit/internal/controls/relayout-controller-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-controller-impl.cpp rename to dali-toolkit/internal/controls/relayout-controller-impl.cpp diff --git a/base/dali-toolkit/internal/controls/relayout-controller-impl.h b/dali-toolkit/internal/controls/relayout-controller-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-controller-impl.h rename to dali-toolkit/internal/controls/relayout-controller-impl.h diff --git a/base/dali-toolkit/internal/controls/relayout-controller.cpp b/dali-toolkit/internal/controls/relayout-controller.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-controller.cpp rename to dali-toolkit/internal/controls/relayout-controller.cpp diff --git a/base/dali-toolkit/internal/controls/relayout-controller.h b/dali-toolkit/internal/controls/relayout-controller.h similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-controller.h rename to dali-toolkit/internal/controls/relayout-controller.h diff --git a/base/dali-toolkit/internal/controls/relayout-helper.cpp b/dali-toolkit/internal/controls/relayout-helper.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-helper.cpp rename to dali-toolkit/internal/controls/relayout-helper.cpp diff --git a/base/dali-toolkit/internal/controls/relayout-helper.h b/dali-toolkit/internal/controls/relayout-helper.h similarity index 100% rename from base/dali-toolkit/internal/controls/relayout-helper.h rename to dali-toolkit/internal/controls/relayout-helper.h diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp similarity index 90% rename from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp rename to dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 1191db6..02267f5 100755 --- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -40,35 +40,15 @@ const float DEFAULT_PAN_GESTURE_PROCESS_TIME(16.7f); // 16.7 milliseconds, i.e. 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 @@ -228,10 +208,7 @@ void ScrollBar::ApplyConstraints() } else { - constraint = Constraint::New( Actor::SIZE, - ParentSource( Actor::SIZE ), - IndicatorSizeConstraint( mScrollConnector.GetContentLength() ) ); - mIndicatorSizeConstraint = mIndicator.ApplyConstraint( constraint ); + mIndicator.SetSize( IndicatorSize( Self().GetCurrentSize(), mScrollConnector.GetContentLength() ) ); } if(mIndicatorPositionConstraint) @@ -245,16 +222,6 @@ void ScrollBar::ApplyConstraints() Source( mScrollPositionObject, Toolkit::ScrollConnector::SCROLL_POSITION ), IndicatorPositionConstraint( mScrollConnector.GetMinLimit(), mScrollConnector.GetMaxLimit() ) ); mIndicatorPositionConstraint = mIndicator.ApplyConstraint( constraint ); - - if( mBackground ) - { - mBackground.RemoveConstraints(); - - constraint = Constraint::New(Actor::SIZE, - ParentSource(Actor::SIZE), - EqualToConstraint()); - mBackground.ApplyConstraint(constraint); - } } } @@ -397,6 +364,14 @@ void ScrollBar::OnPan( PanGesture gesture ) } } +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 diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h similarity index 98% rename from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h rename to dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index 5cfca6a..989ffa4 100755 --- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -186,6 +186,11 @@ private: // from Control */ virtual void OnPan( PanGesture gesture ); + /** + * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size ) + */ + virtual void OnControlSizeSet( const Vector3& size ); + private: /** @@ -225,7 +230,6 @@ 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. diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp rename to dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h rename to dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp rename to dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp diff --git a/base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h similarity index 100% rename from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h rename to dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h diff --git a/base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp rename to dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h rename to dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp rename to dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h rename to dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h rename to dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp rename to dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h rename to dali-toolkit/internal/controls/scrollable/scrollable-impl.h diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp rename to dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h rename to dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/slider/slider-impl.cpp rename to dali-toolkit/internal/controls/slider/slider-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/slider/slider-impl.h rename to dali-toolkit/internal/controls/slider/slider-impl.h diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp rename to dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h rename to dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h diff --git a/base/dali-toolkit/internal/controls/table-view/array-2d.h b/dali-toolkit/internal/controls/table-view/array-2d.h similarity index 100% rename from base/dali-toolkit/internal/controls/table-view/array-2d.h rename to dali-toolkit/internal/controls/table-view/array-2d.h diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp similarity index 90% rename from base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp rename to dali-toolkit/internal/controls/table-view/table-view-impl.cpp index 0db4cbf..76eab51 100644 --- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp @@ -20,8 +20,6 @@ // EXTERNAL INCLUDES #include -#include -#include #include #include #include @@ -34,39 +32,17 @@ namespace 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 @@ -137,9 +113,8 @@ namespace Toolkit 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 { @@ -166,9 +141,8 @@ TypeRegistration mType( typeid(Toolkit::TableView), typeid(Toolkit::Control), Cr 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 @@ -615,16 +589,6 @@ float TableView::GetRelativeWidth( unsigned int columnIndex ) const 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; @@ -679,23 +643,8 @@ void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container ) Vector2 fixedPosition( ( colPos + 1.0f ) * mPadding.width + cumulatedFixedWidth, ( rowPos + 1.0f ) * mPadding.height + cumulatedFixedHeight ); - Constraint widthConstraint = Constraint::New( Actor::POSITION_X, - ParentSource( Actor::SIZE_WIDTH ), - RelativeToWidthOrHeight( relativePosition.x, positionPadding.x, fixedPosition.x ) ); - - Constraint heightConstraint = Constraint::New( 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 @@ -731,29 +680,11 @@ void TableView::OnRelayout( const Vector2& size, ActorSizeContainer& container ) 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( Actor::SIZE_WIDTH, - ParentSource( Actor::SIZE_WIDTH ), - relativeWidthFunctor ); - - heightConstraint = Constraint::New( 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 @@ -807,11 +738,6 @@ void TableView::SetProperty( BaseObject* object, Property::Index index, const Pr tableViewImpl.SetCellPadding( value.Get() ); break; } - case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION: - { - tableViewImpl.SetLayoutAnimationDuration( value.Get() ); - break; - } case Toolkit::TableView::PROPERTY_LAYOUT_ROWS: { SetHeightOrWidthProperty( tableViewImpl, &TableView::SetFixedHeight, &TableView::SetRelativeHeight, value ); @@ -852,11 +778,6 @@ Property::Value TableView::GetProperty( BaseObject* object, Property::Index inde value = tableViewImpl.GetCellPadding(); break; } - case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION: - { - value = tableViewImpl.GetLayoutAnimationDuration(); - break; - } case Toolkit::TableView::PROPERTY_LAYOUT_ROWS: { value = tableViewImpl.GetRowHeightsPropertyValue(); @@ -953,8 +874,7 @@ void TableView::OnControlChildRemove( Actor& child ) 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 ); diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h b/dali-toolkit/internal/controls/table-view/table-view-impl.h similarity index 97% rename from base/dali-toolkit/internal/controls/table-view/table-view-impl.h rename to dali-toolkit/internal/controls/table-view/table-view-impl.h index 82110a3..9939a05 100644 --- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.h +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h @@ -174,17 +174,6 @@ public: 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(); @@ -376,7 +365,6 @@ private: // Data std::vector mRelativeWidths; Size mPadding; bool mLayoutingChild; - float mConstraintDuration; }; diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp rename to dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h b/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp rename to dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h b/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-handles-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp rename to dali-toolkit/internal/controls/text-input/text-input-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/dali-toolkit/internal/controls/text-input/text-input-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp rename to dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h b/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-popup-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h b/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp b/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp rename to dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h b/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h b/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h rename to dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h diff --git a/base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h b/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h rename to dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp b/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp rename to dali-toolkit/internal/controls/text-view/relayout-utilities.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/relayout-utilities.h b/dali-toolkit/internal/controls/text-view/relayout-utilities.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/relayout-utilities.h rename to dali-toolkit/internal/controls/text-view/relayout-utilities.h diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp b/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp rename to dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h b/dali-toolkit/internal/controls/text-view/split-by-char-policies.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h rename to dali-toolkit/internal/controls/text-view/split-by-char-policies.h diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp b/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp rename to dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h b/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h rename to dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp b/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp rename to dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h b/dali-toolkit/internal/controls/text-view/split-by-word-policies.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h rename to dali-toolkit/internal/controls/text-view/split-by-word-policies.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp b/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp rename to dali-toolkit/internal/controls/text-view/text-actor-cache.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-actor-cache.h b/dali-toolkit/internal/controls/text-view/text-actor-cache.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-actor-cache.h rename to dali-toolkit/internal/controls/text-view/text-actor-cache.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp b/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp rename to dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h b/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h rename to dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-processor.cpp b/dali-toolkit/internal/controls/text-view/text-processor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-processor.cpp rename to dali-toolkit/internal/controls/text-view/text-processor.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-processor.h b/dali-toolkit/internal/controls/text-view/text-processor.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-processor.h rename to dali-toolkit/internal/controls/text-view/text-processor.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp b/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp rename to dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp b/dali-toolkit/internal/controls/text-view/text-view-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp rename to dali-toolkit/internal/controls/text-view/text-view-impl.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/dali-toolkit/internal/controls/text-view/text-view-impl.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-impl.h rename to dali-toolkit/internal/controls/text-view/text-view-impl.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp b/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp rename to dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h b/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h rename to dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp rename to dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h b/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h rename to dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp b/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp rename to dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h b/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h rename to dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h b/dali-toolkit/internal/controls/text-view/text-view-processor-types.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h rename to dali-toolkit/internal/controls/text-view/text-view-processor-types.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp b/dali-toolkit/internal/controls/text-view/text-view-processor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp rename to dali-toolkit/internal/controls/text-view/text-view-processor.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-processor.h b/dali-toolkit/internal/controls/text-view/text-view-processor.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-processor.h rename to dali-toolkit/internal/controls/text-view/text-view-processor.h diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp b/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp rename to dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h b/dali-toolkit/internal/controls/text-view/text-view-word-processor.h similarity index 100% rename from base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h rename to dali-toolkit/internal/controls/text-view/text-view-word-processor.h diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp rename to dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h rename to dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/dali-toolkit/internal/controls/view/view-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/controls/view/view-impl.cpp rename to dali-toolkit/internal/controls/view/view-impl.cpp diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/dali-toolkit/internal/controls/view/view-impl.h similarity index 100% rename from optional/dali-toolkit/internal/controls/view/view-impl.h rename to dali-toolkit/internal/controls/view/view-impl.h diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list new file mode 100644 index 0000000..da91a77 --- /dev/null +++ b/dali-toolkit/internal/file.list @@ -0,0 +1,99 @@ +# 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 + diff --git a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp similarity index 100% rename from optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp rename to dali-toolkit/internal/filters/blur-two-pass-filter.cpp diff --git a/optional/dali-toolkit/internal/filters/blur-two-pass-filter.h b/dali-toolkit/internal/filters/blur-two-pass-filter.h similarity index 100% rename from optional/dali-toolkit/internal/filters/blur-two-pass-filter.h rename to dali-toolkit/internal/filters/blur-two-pass-filter.h diff --git a/optional/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp similarity index 100% rename from optional/dali-toolkit/internal/filters/emboss-filter.cpp rename to dali-toolkit/internal/filters/emboss-filter.cpp diff --git a/optional/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h similarity index 100% rename from optional/dali-toolkit/internal/filters/emboss-filter.h rename to dali-toolkit/internal/filters/emboss-filter.h diff --git a/optional/dali-toolkit/internal/filters/image-filter.cpp b/dali-toolkit/internal/filters/image-filter.cpp similarity index 100% rename from optional/dali-toolkit/internal/filters/image-filter.cpp rename to dali-toolkit/internal/filters/image-filter.cpp diff --git a/optional/dali-toolkit/internal/filters/image-filter.h b/dali-toolkit/internal/filters/image-filter.h similarity index 100% rename from optional/dali-toolkit/internal/filters/image-filter.h rename to dali-toolkit/internal/filters/image-filter.h diff --git a/optional/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp similarity index 100% rename from optional/dali-toolkit/internal/filters/spread-filter.cpp rename to dali-toolkit/internal/filters/spread-filter.cpp diff --git a/optional/dali-toolkit/internal/filters/spread-filter.h b/dali-toolkit/internal/filters/spread-filter.h similarity index 100% rename from optional/dali-toolkit/internal/filters/spread-filter.h rename to dali-toolkit/internal/filters/spread-filter.h diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp rename to dali-toolkit/internal/focus-manager/focus-manager-impl.cpp diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/dali-toolkit/internal/focus-manager/focus-manager-impl.h similarity index 100% rename from base/dali-toolkit/internal/focus-manager/focus-manager-impl.h rename to dali-toolkit/internal/focus-manager/focus-manager-impl.h diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp rename to dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h similarity index 100% rename from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h rename to dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp rename to dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp diff --git a/base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h similarity index 100% rename from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h rename to dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h diff --git a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp rename to dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h b/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h rename to dali-toolkit/internal/shader-effects/page-turn-effect-impl.h diff --git a/optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp b/dali-toolkit/internal/shader-effects/water-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp rename to dali-toolkit/internal/shader-effects/water-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/shader-effects/water-effect-impl.h b/dali-toolkit/internal/shader-effects/water-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/shader-effects/water-effect-impl.h rename to dali-toolkit/internal/shader-effects/water-effect-impl.h diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp similarity index 100% rename from base/dali-toolkit/internal/styling/style-manager-impl.cpp rename to dali-toolkit/internal/styling/style-manager-impl.cpp diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h similarity index 100% rename from base/dali-toolkit/internal/styling/style-manager-impl.h rename to dali-toolkit/internal/styling/style-manager-impl.h diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp rename to dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h rename to dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp rename to dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h rename to dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp rename to dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h rename to dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp rename to dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp diff --git a/optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h similarity index 100% rename from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h rename to dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h diff --git a/base/dali-toolkit/public-api/builder/builder.cpp b/dali-toolkit/public-api/builder/builder.cpp similarity index 100% rename from base/dali-toolkit/public-api/builder/builder.cpp rename to dali-toolkit/public-api/builder/builder.cpp diff --git a/base/dali-toolkit/public-api/builder/builder.h b/dali-toolkit/public-api/builder/builder.h similarity index 100% rename from base/dali-toolkit/public-api/builder/builder.h rename to dali-toolkit/public-api/builder/builder.h diff --git a/base/dali-toolkit/public-api/builder/json-parser.cpp b/dali-toolkit/public-api/builder/json-parser.cpp similarity index 100% rename from base/dali-toolkit/public-api/builder/json-parser.cpp rename to dali-toolkit/public-api/builder/json-parser.cpp diff --git a/base/dali-toolkit/public-api/builder/json-parser.h b/dali-toolkit/public-api/builder/json-parser.h similarity index 100% rename from base/dali-toolkit/public-api/builder/json-parser.h rename to dali-toolkit/public-api/builder/json-parser.h diff --git a/base/dali-toolkit/public-api/builder/tree-node.cpp b/dali-toolkit/public-api/builder/tree-node.cpp similarity index 100% rename from base/dali-toolkit/public-api/builder/tree-node.cpp rename to dali-toolkit/public-api/builder/tree-node.cpp diff --git a/base/dali-toolkit/public-api/builder/tree-node.h b/dali-toolkit/public-api/builder/tree-node.h similarity index 100% rename from base/dali-toolkit/public-api/builder/tree-node.h rename to dali-toolkit/public-api/builder/tree-node.h diff --git a/base/dali-toolkit/public-api/controls/alignment/alignment.cpp b/dali-toolkit/public-api/controls/alignment/alignment.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/alignment/alignment.cpp rename to dali-toolkit/public-api/controls/alignment/alignment.cpp diff --git a/base/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/public-api/controls/alignment/alignment.h similarity index 100% rename from base/dali-toolkit/public-api/controls/alignment/alignment.h rename to dali-toolkit/public-api/controls/alignment/alignment.h diff --git a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp b/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp rename to dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/dali-toolkit/public-api/controls/bloom-view/bloom-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h rename to dali-toolkit/public-api/controls/bloom-view/bloom-view.h diff --git a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp b/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp rename to dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp diff --git a/optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h rename to dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h diff --git a/base/dali-toolkit/public-api/controls/buttons/button.cpp b/dali-toolkit/public-api/controls/buttons/button.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/button.cpp rename to dali-toolkit/public-api/controls/buttons/button.cpp diff --git a/base/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/button.h rename to dali-toolkit/public-api/controls/buttons/button.h diff --git a/base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp rename to dali-toolkit/public-api/controls/buttons/check-box-button.cpp diff --git a/base/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/check-box-button.h rename to dali-toolkit/public-api/controls/buttons/check-box-button.h diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp b/dali-toolkit/public-api/controls/buttons/push-button.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/push-button.cpp rename to dali-toolkit/public-api/controls/buttons/push-button.cpp diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/push-button.h rename to dali-toolkit/public-api/controls/buttons/push-button.h diff --git a/base/dali-toolkit/public-api/controls/buttons/radio-button.cpp b/dali-toolkit/public-api/controls/buttons/radio-button.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/radio-button.cpp rename to dali-toolkit/public-api/controls/buttons/radio-button.cpp diff --git a/base/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h similarity index 100% rename from base/dali-toolkit/public-api/controls/buttons/radio-button.h rename to dali-toolkit/public-api/controls/buttons/radio-button.h diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp b/dali-toolkit/public-api/controls/cluster/cluster-style.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp rename to dali-toolkit/public-api/controls/cluster/cluster-style.cpp diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster-style.h b/dali-toolkit/public-api/controls/cluster/cluster-style.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/cluster/cluster-style.h rename to dali-toolkit/public-api/controls/cluster/cluster-style.h diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster.cpp b/dali-toolkit/public-api/controls/cluster/cluster.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/cluster/cluster.cpp rename to dali-toolkit/public-api/controls/cluster/cluster.cpp diff --git a/optional/dali-toolkit/public-api/controls/cluster/cluster.h b/dali-toolkit/public-api/controls/cluster/cluster.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/cluster/cluster.h rename to dali-toolkit/public-api/controls/cluster/cluster.h diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/control-impl.cpp rename to dali-toolkit/public-api/controls/control-impl.cpp diff --git a/base/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h similarity index 100% rename from base/dali-toolkit/public-api/controls/control-impl.h rename to dali-toolkit/public-api/controls/control-impl.h diff --git a/base/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/control.cpp rename to dali-toolkit/public-api/controls/control.cpp diff --git a/base/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h similarity index 100% rename from base/dali-toolkit/public-api/controls/control.h rename to dali-toolkit/public-api/controls/control.h diff --git a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp rename to dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp diff --git a/base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h b/dali-toolkit/public-api/controls/default-controls/check-button-factory.h similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h rename to dali-toolkit/public-api/controls/default-controls/check-button-factory.h diff --git a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp b/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp rename to dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp diff --git a/base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h b/dali-toolkit/public-api/controls/default-controls/push-button-factory.h similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h rename to dali-toolkit/public-api/controls/default-controls/push-button-factory.h diff --git a/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp rename to dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp diff --git a/base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h similarity index 100% rename from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h rename to dali-toolkit/public-api/controls/default-controls/solid-color-actor.h diff --git a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp b/dali-toolkit/public-api/controls/effects-view/effects-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp rename to dali-toolkit/public-api/controls/effects-view/effects-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/effects-view/effects-view.h b/dali-toolkit/public-api/controls/effects-view/effects-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/effects-view/effects-view.h rename to dali-toolkit/public-api/controls/effects-view/effects-view.h diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp rename to dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h rename to dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp b/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp rename to dali-toolkit/public-api/controls/image-view/masked-image-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/dali-toolkit/public-api/controls/image-view/masked-image-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h rename to dali-toolkit/public-api/controls/image-view/masked-image-view.h diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp b/dali-toolkit/public-api/controls/magnifier/magnifier.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp rename to dali-toolkit/public-api/controls/magnifier/magnifier.cpp diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h b/dali-toolkit/public-api/controls/magnifier/magnifier.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/magnifier/magnifier.h rename to dali-toolkit/public-api/controls/magnifier/magnifier.h diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h b/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h rename to dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp rename to dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h rename to dali-toolkit/public-api/controls/navigation-frame/navigation-control.h diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp b/dali-toolkit/public-api/controls/navigation-frame/page.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp rename to dali-toolkit/public-api/controls/navigation-frame/page.cpp diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/page.h b/dali-toolkit/public-api/controls/navigation-frame/page.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/navigation-frame/page.h rename to dali-toolkit/public-api/controls/navigation-frame/page.h diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h b/dali-toolkit/public-api/controls/page-turn-view/page-factory.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h rename to dali-toolkit/public-api/controls/page-turn-view/page-factory.h diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h rename to dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h diff --git a/base/dali-toolkit/public-api/controls/popup/popup.cpp b/dali-toolkit/public-api/controls/popup/popup.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/popup/popup.cpp rename to dali-toolkit/public-api/controls/popup/popup.cpp diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/dali-toolkit/public-api/controls/popup/popup.h similarity index 100% rename from base/dali-toolkit/public-api/controls/popup/popup.h rename to dali-toolkit/public-api/controls/popup/popup.h diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp rename to dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h rename to dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h rename to dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h rename to dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h rename to dali-toolkit/public-api/controls/scrollable/item-view/item-view.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp rename to dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h rename to dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h rename to dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-component.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/dali-toolkit/public-api/controls/scrollable/scroll-component.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-component.h rename to dali-toolkit/public-api/controls/scrollable/scroll-component.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/dali-toolkit/public-api/controls/scrollable/scroll-connector.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h rename to dali-toolkit/public-api/controls/scrollable/scroll-connector.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h rename to dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp rename to dali-toolkit/public-api/controls/scrollable/scrollable.cpp diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h similarity index 100% rename from base/dali-toolkit/public-api/controls/scrollable/scrollable.h rename to dali-toolkit/public-api/controls/scrollable/scrollable.h diff --git a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp b/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp rename to dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/dali-toolkit/public-api/controls/shadow-view/shadow-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h rename to dali-toolkit/public-api/controls/shadow-view/shadow-view.h diff --git a/optional/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/public-api/controls/slider/slider.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/slider/slider.cpp rename to dali-toolkit/public-api/controls/slider/slider.cpp diff --git a/optional/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/slider/slider.h rename to dali-toolkit/public-api/controls/slider/slider.h diff --git a/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp b/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp rename to dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp diff --git a/optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h rename to dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h diff --git a/base/dali-toolkit/public-api/controls/table-view/table-view.cpp b/dali-toolkit/public-api/controls/table-view/table-view.cpp similarity index 95% rename from base/dali-toolkit/public-api/controls/table-view/table-view.cpp rename to dali-toolkit/public-api/controls/table-view/table-view.cpp index 06c18a9..7c77387 100644 --- a/base/dali-toolkit/public-api/controls/table-view/table-view.cpp +++ b/dali-toolkit/public-api/controls/table-view/table-view.cpp @@ -175,16 +175,6 @@ float TableView::GetRelativeWidth( unsigned int columnIndex ) const 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(); diff --git a/base/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h similarity index 95% rename from base/dali-toolkit/public-api/controls/table-view/table-view.h rename to dali-toolkit/public-api/controls/table-view/table-view.h index 1b4a332..d7c8ed3 100644 --- a/base/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -50,7 +50,6 @@ public: 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 @@ -333,19 +332,6 @@ public: 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(); diff --git a/base/dali-toolkit/public-api/controls/text-input/text-input.cpp b/dali-toolkit/public-api/controls/text-input/text-input.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/text-input/text-input.cpp rename to dali-toolkit/public-api/controls/text-input/text-input.cpp diff --git a/base/dali-toolkit/public-api/controls/text-input/text-input.h b/dali-toolkit/public-api/controls/text-input/text-input.h similarity index 100% rename from base/dali-toolkit/public-api/controls/text-input/text-input.h rename to dali-toolkit/public-api/controls/text-input/text-input.h diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.cpp b/dali-toolkit/public-api/controls/text-view/text-view.cpp similarity index 100% rename from base/dali-toolkit/public-api/controls/text-view/text-view.cpp rename to dali-toolkit/public-api/controls/text-view/text-view.cpp diff --git a/base/dali-toolkit/public-api/controls/text-view/text-view.h b/dali-toolkit/public-api/controls/text-view/text-view.h similarity index 100% rename from base/dali-toolkit/public-api/controls/text-view/text-view.h rename to dali-toolkit/public-api/controls/text-view/text-view.h diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp b/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp rename to dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/dali-toolkit/public-api/controls/tool-bar/tool-bar.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h rename to dali-toolkit/public-api/controls/tool-bar/tool-bar.h diff --git a/optional/dali-toolkit/public-api/controls/view/view.cpp b/dali-toolkit/public-api/controls/view/view.cpp similarity index 100% rename from optional/dali-toolkit/public-api/controls/view/view.cpp rename to dali-toolkit/public-api/controls/view/view.cpp diff --git a/optional/dali-toolkit/public-api/controls/view/view.h b/dali-toolkit/public-api/controls/view/view.h similarity index 100% rename from optional/dali-toolkit/public-api/controls/view/view.h rename to dali-toolkit/public-api/controls/view/view.h diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp similarity index 96% rename from optional/dali-toolkit/public-api/dali-toolkit-version.cpp rename to dali-toolkit/public-api/dali-toolkit-version.cpp index b4f4c1b..5a1a4dc 100644 --- a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit 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 diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.h b/dali-toolkit/public-api/dali-toolkit-version.h similarity index 100% rename from optional/dali-toolkit/public-api/dali-toolkit-version.h rename to dali-toolkit/public-api/dali-toolkit-version.h diff --git a/base/dali-toolkit/public-api/enums.cpp b/dali-toolkit/public-api/enums.cpp similarity index 100% rename from base/dali-toolkit/public-api/enums.cpp rename to dali-toolkit/public-api/enums.cpp diff --git a/base/dali-toolkit/public-api/enums.h b/dali-toolkit/public-api/enums.h similarity index 100% rename from base/dali-toolkit/public-api/enums.h rename to dali-toolkit/public-api/enums.h diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list new file mode 100755 index 0000000..1b9307a --- /dev/null +++ b/dali-toolkit/public-api/file.list @@ -0,0 +1,274 @@ +# 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 + diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.cpp b/dali-toolkit/public-api/focus-manager/focus-manager.cpp similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/focus-manager.cpp rename to dali-toolkit/public-api/focus-manager/focus-manager.cpp diff --git a/base/dali-toolkit/public-api/focus-manager/focus-manager.h b/dali-toolkit/public-api/focus-manager/focus-manager.h similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/focus-manager.h rename to dali-toolkit/public-api/focus-manager/focus-manager.h diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp rename to dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp diff --git a/base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h rename to dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp b/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp rename to dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp diff --git a/base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h similarity index 100% rename from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h rename to dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.cpp b/dali-toolkit/public-api/markup-processor/markup-processor.cpp similarity index 100% rename from base/dali-toolkit/public-api/markup-processor/markup-processor.cpp rename to dali-toolkit/public-api/markup-processor/markup-processor.cpp diff --git a/base/dali-toolkit/public-api/markup-processor/markup-processor.h b/dali-toolkit/public-api/markup-processor/markup-processor.h similarity index 100% rename from base/dali-toolkit/public-api/markup-processor/markup-processor.h rename to dali-toolkit/public-api/markup-processor/markup-processor.h diff --git a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp b/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp rename to dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h b/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h rename to dali-toolkit/public-api/shader-effects/alpha-discard-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp b/dali-toolkit/public-api/shader-effects/bendy-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp rename to dali-toolkit/public-api/shader-effects/bendy-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/bendy-effect.h b/dali-toolkit/public-api/shader-effects/bendy-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bendy-effect.h rename to dali-toolkit/public-api/shader-effects/bendy-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp b/dali-toolkit/public-api/shader-effects/blind-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp rename to dali-toolkit/public-api/shader-effects/blind-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/blind-effect.h b/dali-toolkit/public-api/shader-effects/blind-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/blind-effect.h rename to dali-toolkit/public-api/shader-effects/blind-effect.h diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp b/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp rename to dali-toolkit/public-api/shader-effects/bouncing-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/dali-toolkit/public-api/shader-effects/bouncing-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/bouncing-effect.h rename to dali-toolkit/public-api/shader-effects/bouncing-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp b/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp rename to dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h b/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h rename to dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp rename to dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h rename to dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/dali-toolkit/public-api/shader-effects/carousel-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp rename to dali-toolkit/public-api/shader-effects/carousel-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.h b/dali-toolkit/public-api/shader-effects/carousel-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/carousel-effect.h rename to dali-toolkit/public-api/shader-effects/carousel-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp b/dali-toolkit/public-api/shader-effects/displacement-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp rename to dali-toolkit/public-api/shader-effects/displacement-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/displacement-effect.h b/dali-toolkit/public-api/shader-effects/displacement-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/displacement-effect.h rename to dali-toolkit/public-api/shader-effects/displacement-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp b/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp rename to dali-toolkit/public-api/shader-effects/dissolve-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/dissolve-effect.h b/dali-toolkit/public-api/shader-effects/dissolve-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/dissolve-effect.h rename to dali-toolkit/public-api/shader-effects/dissolve-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp b/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp rename to dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h b/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h rename to dali-toolkit/public-api/shader-effects/dissolve-local-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp b/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp rename to dali-toolkit/public-api/shader-effects/distance-field-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h b/dali-toolkit/public-api/shader-effects/distance-field-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h rename to dali-toolkit/public-api/shader-effects/distance-field-effect.h diff --git a/base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp b/dali-toolkit/public-api/shader-effects/image-region-effect.cpp similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp rename to dali-toolkit/public-api/shader-effects/image-region-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/image-region-effect.h b/dali-toolkit/public-api/shader-effects/image-region-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/image-region-effect.h rename to dali-toolkit/public-api/shader-effects/image-region-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp b/dali-toolkit/public-api/shader-effects/iris-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp rename to dali-toolkit/public-api/shader-effects/iris-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/iris-effect.h b/dali-toolkit/public-api/shader-effects/iris-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/iris-effect.h rename to dali-toolkit/public-api/shader-effects/iris-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp b/dali-toolkit/public-api/shader-effects/mask-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp rename to dali-toolkit/public-api/shader-effects/mask-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/mask-effect.h b/dali-toolkit/public-api/shader-effects/mask-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/mask-effect.h rename to dali-toolkit/public-api/shader-effects/mask-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp b/dali-toolkit/public-api/shader-effects/mirror-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp rename to dali-toolkit/public-api/shader-effects/mirror-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/mirror-effect.h b/dali-toolkit/public-api/shader-effects/mirror-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/mirror-effect.h rename to dali-toolkit/public-api/shader-effects/mirror-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp b/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp rename to dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h b/dali-toolkit/public-api/shader-effects/motion-blur-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h rename to dali-toolkit/public-api/shader-effects/motion-blur-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp rename to dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h b/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h rename to dali-toolkit/public-api/shader-effects/motion-stretch-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp rename to dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h b/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h rename to dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp b/dali-toolkit/public-api/shader-effects/overlay-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp rename to dali-toolkit/public-api/shader-effects/overlay-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/overlay-effect.h b/dali-toolkit/public-api/shader-effects/overlay-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/overlay-effect.h rename to dali-toolkit/public-api/shader-effects/overlay-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp b/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp rename to dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h b/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h rename to dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp b/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp rename to dali-toolkit/public-api/shader-effects/page-turn-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/page-turn-effect.h b/dali-toolkit/public-api/shader-effects/page-turn-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/page-turn-effect.h rename to dali-toolkit/public-api/shader-effects/page-turn-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp b/dali-toolkit/public-api/shader-effects/ripple-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp rename to dali-toolkit/public-api/shader-effects/ripple-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/ripple-effect.h b/dali-toolkit/public-api/shader-effects/ripple-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/ripple-effect.h rename to dali-toolkit/public-api/shader-effects/ripple-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp b/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp rename to dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h b/dali-toolkit/public-api/shader-effects/ripple2d-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h rename to dali-toolkit/public-api/shader-effects/ripple2d-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp b/dali-toolkit/public-api/shader-effects/shear-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp rename to dali-toolkit/public-api/shader-effects/shear-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/shear-effect.h b/dali-toolkit/public-api/shader-effects/shear-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/shear-effect.h rename to dali-toolkit/public-api/shader-effects/shear-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp b/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp rename to dali-toolkit/public-api/shader-effects/soft-button-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h b/dali-toolkit/public-api/shader-effects/soft-button-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h rename to dali-toolkit/public-api/shader-effects/soft-button-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp b/dali-toolkit/public-api/shader-effects/spot-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp rename to dali-toolkit/public-api/shader-effects/spot-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/spot-effect.h b/dali-toolkit/public-api/shader-effects/spot-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/spot-effect.h rename to dali-toolkit/public-api/shader-effects/spot-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp b/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp rename to dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h b/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h rename to dali-toolkit/public-api/shader-effects/square-dissolve-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp b/dali-toolkit/public-api/shader-effects/swirl-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp rename to dali-toolkit/public-api/shader-effects/swirl-effect.cpp diff --git a/base/dali-toolkit/public-api/shader-effects/swirl-effect.h b/dali-toolkit/public-api/shader-effects/swirl-effect.h similarity index 100% rename from base/dali-toolkit/public-api/shader-effects/swirl-effect.h rename to dali-toolkit/public-api/shader-effects/swirl-effect.h diff --git a/optional/dali-toolkit/public-api/shader-effects/water-effect.cpp b/dali-toolkit/public-api/shader-effects/water-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/water-effect.cpp rename to dali-toolkit/public-api/shader-effects/water-effect.cpp diff --git a/optional/dali-toolkit/public-api/shader-effects/water-effect.h b/dali-toolkit/public-api/shader-effects/water-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/shader-effects/water-effect.h rename to dali-toolkit/public-api/shader-effects/water-effect.h diff --git a/base/dali-toolkit/public-api/styling/style-manager.cpp b/dali-toolkit/public-api/styling/style-manager.cpp similarity index 100% rename from base/dali-toolkit/public-api/styling/style-manager.cpp rename to dali-toolkit/public-api/styling/style-manager.cpp diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h similarity index 100% rename from base/dali-toolkit/public-api/styling/style-manager.h rename to dali-toolkit/public-api/styling/style-manager.h diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp b/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp rename to dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h rename to dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp b/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp rename to dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h rename to dali-toolkit/public-api/transition-effects/cube-transition-effect.h diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp b/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp rename to dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h rename to dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp b/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp rename to dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp diff --git a/optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h similarity index 100% rename from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h rename to dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h diff --git a/base/dali-toolkit/sounds/End_of_List.ogg b/dali-toolkit/sounds/End_of_List.ogg similarity index 100% rename from base/dali-toolkit/sounds/End_of_List.ogg rename to dali-toolkit/sounds/End_of_List.ogg diff --git a/base/dali-toolkit/sounds/Focus.ogg b/dali-toolkit/sounds/Focus.ogg similarity index 100% rename from base/dali-toolkit/sounds/Focus.ogg rename to dali-toolkit/sounds/Focus.ogg diff --git a/base/dali-toolkit/sounds/List_scroll.ogg b/dali-toolkit/sounds/List_scroll.ogg similarity index 100% rename from base/dali-toolkit/sounds/List_scroll.ogg rename to dali-toolkit/sounds/List_scroll.ogg diff --git a/dali-toolkit/sounds/file.list b/dali-toolkit/sounds/file.list new file mode 100644 index 0000000..b1df2c4 --- /dev/null +++ b/dali-toolkit/sounds/file.list @@ -0,0 +1,4 @@ +# Files to install here + +dali_toolkit_sound_files =\ + $(toolkit_sounds_dir)/*.ogg diff --git a/base/dali-toolkit/styles/file.list b/dali-toolkit/styles/file.list similarity index 58% rename from base/dali-toolkit/styles/file.list rename to dali-toolkit/styles/file.list index 83a6e26..8e49fbe 100644 --- a/base/dali-toolkit/styles/file.list +++ b/dali-toolkit/styles/file.list @@ -1,4 +1,4 @@ # Files to install here dali_toolkit_style_files =\ - $(toolkit_base_styles_dir)/*.json + $(toolkit_styles_dir)/*.json diff --git a/base/dali-toolkit/styles/tizen-dark-theme.json b/dali-toolkit/styles/tizen-dark-theme.json similarity index 100% rename from base/dali-toolkit/styles/tizen-dark-theme.json rename to dali-toolkit/styles/tizen-dark-theme.json diff --git a/base/dali-toolkit/styles/tizen-default-theme.json b/dali-toolkit/styles/tizen-default-theme.json similarity index 100% rename from base/dali-toolkit/styles/tizen-default-theme.json rename to dali-toolkit/styles/tizen-default-theme.json diff --git a/optional/dali-toolkit/images/file.list b/optional/dali-toolkit/images/file.list deleted file mode 100644 index 44104c8..0000000 --- a/optional/dali-toolkit/images/file.list +++ /dev/null @@ -1,4 +0,0 @@ -# Files to install here - -dali_toolkit_optional_image_files =\ - $(toolkit_optional_images_dir)/*.png diff --git a/optional/dali-toolkit/internal/file.list b/optional/dali-toolkit/internal/file.list deleted file mode 100644 index d06c048..0000000 --- a/optional/dali-toolkit/internal/file.list +++ /dev/null @@ -1,34 +0,0 @@ -# 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 diff --git a/optional/dali-toolkit/public-api/file.list b/optional/dali-toolkit/public-api/file.list deleted file mode 100755 index b12694f..0000000 --- a/optional/dali-toolkit/public-api/file.list +++ /dev/null @@ -1,140 +0,0 @@ -# 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 - diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index b212fc3..ee0e474 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ 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