Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 12 Feb 2015 10:42:42 +0000 (02:42 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 12 Feb 2015 10:42:42 +0000 (02:42 -0800)
467 files changed:
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
base/dali-toolkit/images/file.list [deleted file]
base/dali-toolkit/internal/file.list [deleted file]
base/dali-toolkit/public-api/file.list [deleted file]
base/dali-toolkit/sounds/file.list [deleted file]
build/tizen/configure.ac
build/tizen/dali-toolkit/Makefile.am
build/tizen/docs/dali.doxy.in
dali-toolkit/dali-toolkit.h [moved from optional/dali-toolkit/dali-toolkit.h with 98% similarity]
dali-toolkit/images/00_popup_bg.png [moved from base/dali-toolkit/images/00_popup_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bottom_bg.png [moved from optional/dali-toolkit/images/00_popup_bottom_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bubble_bg.png [moved from optional/dali-toolkit/images/00_popup_bubble_bg.png with 100% similarity]
dali-toolkit/images/00_popup_bubble_tail_bottom.png [moved from optional/dali-toolkit/images/00_popup_bubble_tail_bottom.png with 100% similarity]
dali-toolkit/images/00_popup_button_bg.png [moved from base/dali-toolkit/images/00_popup_button_bg.png with 100% similarity]
dali-toolkit/images/00_popup_button_pressed.png [moved from optional/dali-toolkit/images/00_popup_button_pressed.png with 100% similarity]
dali-toolkit/images/B16-8_TTS_focus.png [moved from base/dali-toolkit/images/B16-8_TTS_focus.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_clipboard.png [moved from base/dali-toolkit/images/copy_paste_icon_clipboard.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_copy.png [moved from base/dali-toolkit/images/copy_paste_icon_copy.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_cut.png [moved from base/dali-toolkit/images/copy_paste_icon_cut.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_paste.png [moved from base/dali-toolkit/images/copy_paste_icon_paste.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_select.png [moved from base/dali-toolkit/images/copy_paste_icon_select.png with 100% similarity]
dali-toolkit/images/copy_paste_icon_select_all.png [moved from base/dali-toolkit/images/copy_paste_icon_select_all.png with 100% similarity]
dali-toolkit/images/file.list [new file with mode: 0644]
dali-toolkit/images/insertpoint-icon.png [moved from base/dali-toolkit/images/insertpoint-icon.png with 100% similarity]
dali-toolkit/images/keyboard_focus.png [moved from base/dali-toolkit/images/keyboard_focus.png with 100% similarity]
dali-toolkit/images/magnifier-image-frame.png [moved from optional/dali-toolkit/images/magnifier-image-frame.png with 100% similarity]
dali-toolkit/images/magnifier.png [moved from optional/dali-toolkit/images/magnifier.png with 100% similarity]
dali-toolkit/images/popup_bg.png [moved from base/dali-toolkit/images/popup_bg.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg.#.png [moved from base/dali-toolkit/images/popup_bubble_bg.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg_ef.#.png [moved from base/dali-toolkit/images/popup_bubble_bg_ef.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_bg_line.#.png [moved from base/dali-toolkit/images/popup_bubble_bg_line.#.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom_ef.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom_ef.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_bottom_line.png [moved from base/dali-toolkit/images/popup_bubble_tail_bottom_line.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top.png [moved from base/dali-toolkit/images/popup_bubble_tail_top.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top_ef.png [moved from base/dali-toolkit/images/popup_bubble_tail_top_ef.png with 100% similarity]
dali-toolkit/images/popup_bubble_tail_top_line.png [moved from base/dali-toolkit/images/popup_bubble_tail_top_line.png with 100% similarity]
dali-toolkit/images/popup_scroll.png [moved from optional/dali-toolkit/images/popup_scroll.png with 100% similarity]
dali-toolkit/images/popup_tail_down.png [moved from optional/dali-toolkit/images/popup_tail_down.png with 100% similarity]
dali-toolkit/images/popup_tail_left.png [moved from optional/dali-toolkit/images/popup_tail_left.png with 100% similarity]
dali-toolkit/images/popup_tail_right.png [moved from optional/dali-toolkit/images/popup_tail_right.png with 100% similarity]
dali-toolkit/images/popup_tail_up.png [moved from optional/dali-toolkit/images/popup_tail_up.png with 100% similarity]
dali-toolkit/images/radio-button-selected.png [moved from base/dali-toolkit/images/radio-button-selected.png with 100% similarity]
dali-toolkit/images/radio-button-unselected.png [moved from base/dali-toolkit/images/radio-button-unselected.png with 100% similarity]
dali-toolkit/images/slider-popup-arrow.png [moved from optional/dali-toolkit/images/slider-popup-arrow.png with 100% similarity]
dali-toolkit/images/slider-popup.9.png [moved from optional/dali-toolkit/images/slider-popup.9.png with 100% similarity]
dali-toolkit/images/slider-popup.png [moved from optional/dali-toolkit/images/slider-popup.png with 100% similarity]
dali-toolkit/images/slider-skin-handle.png [moved from optional/dali-toolkit/images/slider-skin-handle.png with 100% similarity]
dali-toolkit/images/slider-skin-progress.9.png [moved from optional/dali-toolkit/images/slider-skin-progress.9.png with 100% similarity]
dali-toolkit/images/slider-skin-progress.png [moved from optional/dali-toolkit/images/slider-skin-progress.png with 100% similarity]
dali-toolkit/images/slider-skin.9.png [moved from optional/dali-toolkit/images/slider-skin.9.png with 100% similarity]
dali-toolkit/images/slider-skin.png [moved from optional/dali-toolkit/images/slider-skin.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-left-press.png [moved from base/dali-toolkit/images/text-input-selection-handle-left-press.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-left.png [moved from base/dali-toolkit/images/text-input-selection-handle-left.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-right-press.png [moved from base/dali-toolkit/images/text-input-selection-handle-right-press.png with 100% similarity]
dali-toolkit/images/text-input-selection-handle-right.png [moved from base/dali-toolkit/images/text-input-selection-handle-right.png with 100% similarity]
dali-toolkit/internal/builder/builder-actor.cpp [moved from base/dali-toolkit/internal/builder/builder-actor.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-animations.cpp [moved from base/dali-toolkit/internal/builder/builder-animations.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-declarations.h [moved from base/dali-toolkit/internal/builder/builder-declarations.h with 100% similarity]
dali-toolkit/internal/builder/builder-filesystem.h [moved from base/dali-toolkit/internal/builder/builder-filesystem.h with 100% similarity]
dali-toolkit/internal/builder/builder-get-is.inl.h [moved from base/dali-toolkit/internal/builder/builder-get-is.inl.h with 100% similarity]
dali-toolkit/internal/builder/builder-impl.cpp [moved from base/dali-toolkit/internal/builder/builder-impl.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-impl.h [moved from base/dali-toolkit/internal/builder/builder-impl.h with 100% similarity]
dali-toolkit/internal/builder/builder-set-property.cpp [moved from base/dali-toolkit/internal/builder/builder-set-property.cpp with 100% similarity]
dali-toolkit/internal/builder/builder-signals.cpp [moved from base/dali-toolkit/internal/builder/builder-signals.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-impl.cpp [moved from base/dali-toolkit/internal/builder/json-parser-impl.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-impl.h [moved from base/dali-toolkit/internal/builder/json-parser-impl.h with 100% similarity]
dali-toolkit/internal/builder/json-parser-state.cpp [moved from base/dali-toolkit/internal/builder/json-parser-state.cpp with 100% similarity]
dali-toolkit/internal/builder/json-parser-state.h [moved from base/dali-toolkit/internal/builder/json-parser-state.h with 100% similarity]
dali-toolkit/internal/builder/optional-value.h [moved from base/dali-toolkit/internal/builder/optional-value.h with 100% similarity]
dali-toolkit/internal/builder/replacement.cpp [moved from base/dali-toolkit/internal/builder/replacement.cpp with 100% similarity]
dali-toolkit/internal/builder/replacement.h [moved from base/dali-toolkit/internal/builder/replacement.h with 100% similarity]
dali-toolkit/internal/builder/tree-node-manipulator.cpp [moved from base/dali-toolkit/internal/builder/tree-node-manipulator.cpp with 100% similarity]
dali-toolkit/internal/builder/tree-node-manipulator.h [moved from base/dali-toolkit/internal/builder/tree-node-manipulator.h with 100% similarity]
dali-toolkit/internal/controls/alignment/alignment-impl.cpp [moved from base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp with 84% similarity]
dali-toolkit/internal/controls/alignment/alignment-impl.h [moved from base/dali-toolkit/internal/controls/alignment/alignment-impl.h with 100% similarity]
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h [moved from optional/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp [moved from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h [moved from optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-default-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/check-box-button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-default-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/push-button-painter-impl.h [moved from base/dali-toolkit/internal/controls/buttons/push-button-painter-impl.h with 100% similarity]
dali-toolkit/internal/controls/buttons/radio-button-impl.cpp [moved from base/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/buttons/radio-button-impl.h [moved from base/dali-toolkit/internal/controls/buttons/radio-button-impl.h with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-impl.cpp [moved from optional/dali-toolkit/internal/controls/cluster/cluster-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-impl.h [moved from optional/dali-toolkit/internal/controls/cluster/cluster-impl.h with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp [moved from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/cluster/cluster-style-impl.h [moved from optional/dali-toolkit/internal/controls/cluster/cluster-style-impl.h with 100% similarity]
dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/effects-view/effects-view-impl.h [moved from optional/dali-toolkit/internal/controls/effects-view/effects-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h [moved from optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/image-view/masked-image-view-impl.h [moved from optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp [moved from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/magnifier/magnifier-impl.h [moved from optional/dali-toolkit/internal/controls/magnifier/magnifier-impl.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/page-impl.cpp [moved from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/navigation-frame/page-impl.h [moved from optional/dali-toolkit/internal/controls/navigation-frame/page-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h [moved from optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/popup/popup-impl.cpp [moved from base/dali-toolkit/internal/controls/popup/popup-impl.cpp with 91% similarity]
dali-toolkit/internal/controls/popup/popup-impl.h [moved from base/dali-toolkit/internal/controls/popup/popup-impl.h with 98% similarity]
dali-toolkit/internal/controls/popup/popup-style-impl.cpp [moved from base/dali-toolkit/internal/controls/popup/popup-style-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/popup/popup-style-impl.h [moved from base/dali-toolkit/internal/controls/popup/popup-style-impl.h with 100% similarity]
dali-toolkit/internal/controls/relayout-controller-impl.cpp [moved from base/dali-toolkit/internal/controls/relayout-controller-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-controller-impl.h [moved from base/dali-toolkit/internal/controls/relayout-controller-impl.h with 100% similarity]
dali-toolkit/internal/controls/relayout-controller.cpp [moved from base/dali-toolkit/internal/controls/relayout-controller.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-controller.h [moved from base/dali-toolkit/internal/controls/relayout-controller.h with 100% similarity]
dali-toolkit/internal/controls/relayout-helper.cpp [moved from base/dali-toolkit/internal/controls/relayout-helper.cpp with 100% similarity]
dali-toolkit/internal/controls/relayout-helper.h [moved from base/dali-toolkit/internal/controls/relayout-helper.h with 100% similarity]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp [moved from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp with 90% similarity]
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h [moved from base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h with 98% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.h with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.cpp with 100% similarity]
dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h [moved from base/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp [moved from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h [moved from base/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-helper-functions.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.h with 100% similarity]
dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp [moved from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/scrollable/scrollable-impl.h [moved from base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h with 100% similarity]
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h [moved from optional/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/slider/slider-impl.cpp [moved from optional/dali-toolkit/internal/controls/slider/slider-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/slider/slider-impl.h [moved from optional/dali-toolkit/internal/controls/slider/slider-impl.h with 100% similarity]
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp [moved from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h [moved from optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/table-view/array-2d.h [moved from base/dali-toolkit/internal/controls/table-view/array-2d.h with 100% similarity]
dali-toolkit/internal/controls/table-view/table-view-impl.cpp [moved from base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp with 90% similarity]
dali-toolkit/internal/controls/table-view/table-view-impl.h [moved from base/dali-toolkit/internal/controls/table-view/table-view-impl.h with 97% similarity]
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp [moved from base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp [moved from base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-handles-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-handles-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-impl.cpp [moved from base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp [moved from base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-popup-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-popup-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp [moved from base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h [moved from base/dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h [moved from base/dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-view/relayout-utilities.cpp [moved from base/dali-toolkit/internal/controls/text-view/relayout-utilities.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/relayout-utilities.h [moved from base/dali-toolkit/internal/controls/text-view/relayout-utilities.h with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp [moved from base/dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-char-policies.h [moved from base/dali-toolkit/internal/controls/text-view/split-by-char-policies.h with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp [moved from base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h [moved from base/dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp [moved from base/dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/split-by-word-policies.h [moved from base/dali-toolkit/internal/controls/text-view/split-by-word-policies.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-actor-cache.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-actor-cache.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-actor-cache.h [moved from base/dali-toolkit/internal/controls/text-view/text-actor-cache.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h [moved from base/dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-processor.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-processor.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-processor.h [moved from base/dali-toolkit/internal/controls/text-view/text-processor.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-impl.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-impl.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-impl.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor-types.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor-types.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-processor.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-processor.h with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp [moved from base/dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp with 100% similarity]
dali-toolkit/internal/controls/text-view/text-view-word-processor.h [moved from base/dali-toolkit/internal/controls/text-view/text-view-word-processor.h with 100% similarity]
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp [moved from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h [moved from optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h with 100% similarity]
dali-toolkit/internal/controls/view/view-impl.cpp [moved from optional/dali-toolkit/internal/controls/view/view-impl.cpp with 100% similarity]
dali-toolkit/internal/controls/view/view-impl.h [moved from optional/dali-toolkit/internal/controls/view/view-impl.h with 100% similarity]
dali-toolkit/internal/file.list [new file with mode: 0644]
dali-toolkit/internal/filters/blur-two-pass-filter.cpp [moved from optional/dali-toolkit/internal/filters/blur-two-pass-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/blur-two-pass-filter.h [moved from optional/dali-toolkit/internal/filters/blur-two-pass-filter.h with 100% similarity]
dali-toolkit/internal/filters/emboss-filter.cpp [moved from optional/dali-toolkit/internal/filters/emboss-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/emboss-filter.h [moved from optional/dali-toolkit/internal/filters/emboss-filter.h with 100% similarity]
dali-toolkit/internal/filters/image-filter.cpp [moved from optional/dali-toolkit/internal/filters/image-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/image-filter.h [moved from optional/dali-toolkit/internal/filters/image-filter.h with 100% similarity]
dali-toolkit/internal/filters/spread-filter.cpp [moved from optional/dali-toolkit/internal/filters/spread-filter.cpp with 100% similarity]
dali-toolkit/internal/filters/spread-filter.h [moved from optional/dali-toolkit/internal/filters/spread-filter.h with 100% similarity]
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp [moved from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h [moved from base/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h with 100% similarity]
dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp [moved from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/shader-effects/page-turn-effect-impl.h [moved from optional/dali-toolkit/internal/shader-effects/page-turn-effect-impl.h with 100% similarity]
dali-toolkit/internal/shader-effects/water-effect-impl.cpp [moved from optional/dali-toolkit/internal/shader-effects/water-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/shader-effects/water-effect-impl.h [moved from optional/dali-toolkit/internal/shader-effects/water-effect-impl.h with 100% similarity]
dali-toolkit/internal/styling/style-manager-impl.cpp [moved from base/dali-toolkit/internal/styling/style-manager-impl.cpp with 100% similarity]
dali-toolkit/internal/styling/style-manager-impl.h [moved from base/dali-toolkit/internal/styling/style-manager-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp with 100% similarity]
dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h [moved from optional/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h with 100% similarity]
dali-toolkit/public-api/builder/builder.cpp [moved from base/dali-toolkit/public-api/builder/builder.cpp with 100% similarity]
dali-toolkit/public-api/builder/builder.h [moved from base/dali-toolkit/public-api/builder/builder.h with 100% similarity]
dali-toolkit/public-api/builder/json-parser.cpp [moved from base/dali-toolkit/public-api/builder/json-parser.cpp with 100% similarity]
dali-toolkit/public-api/builder/json-parser.h [moved from base/dali-toolkit/public-api/builder/json-parser.h with 100% similarity]
dali-toolkit/public-api/builder/tree-node.cpp [moved from base/dali-toolkit/public-api/builder/tree-node.cpp with 100% similarity]
dali-toolkit/public-api/builder/tree-node.h [moved from base/dali-toolkit/public-api/builder/tree-node.h with 100% similarity]
dali-toolkit/public-api/controls/alignment/alignment.cpp [moved from base/dali-toolkit/public-api/controls/alignment/alignment.cpp with 100% similarity]
dali-toolkit/public-api/controls/alignment/alignment.h [moved from base/dali-toolkit/public-api/controls/alignment/alignment.h with 100% similarity]
dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp [moved from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/bloom-view/bloom-view.h [moved from optional/dali-toolkit/public-api/controls/bloom-view/bloom-view.h with 100% similarity]
dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp [moved from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.cpp with 100% similarity]
dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h [moved from optional/dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/button.h [moved from base/dali-toolkit/public-api/controls/buttons/button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/check-box-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/check-box-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/check-box-button.h [moved from base/dali-toolkit/public-api/controls/buttons/check-box-button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/push-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/push-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/push-button.h [moved from base/dali-toolkit/public-api/controls/buttons/push-button.h with 100% similarity]
dali-toolkit/public-api/controls/buttons/radio-button.cpp [moved from base/dali-toolkit/public-api/controls/buttons/radio-button.cpp with 100% similarity]
dali-toolkit/public-api/controls/buttons/radio-button.h [moved from base/dali-toolkit/public-api/controls/buttons/radio-button.h with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster-style.cpp [moved from optional/dali-toolkit/public-api/controls/cluster/cluster-style.cpp with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster-style.h [moved from optional/dali-toolkit/public-api/controls/cluster/cluster-style.h with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster.cpp [moved from optional/dali-toolkit/public-api/controls/cluster/cluster.cpp with 100% similarity]
dali-toolkit/public-api/controls/cluster/cluster.h [moved from optional/dali-toolkit/public-api/controls/cluster/cluster.h with 100% similarity]
dali-toolkit/public-api/controls/control-impl.cpp [moved from base/dali-toolkit/public-api/controls/control-impl.cpp with 100% similarity]
dali-toolkit/public-api/controls/control-impl.h [moved from base/dali-toolkit/public-api/controls/control-impl.h with 100% similarity]
dali-toolkit/public-api/controls/control.cpp [moved from base/dali-toolkit/public-api/controls/control.cpp with 100% similarity]
dali-toolkit/public-api/controls/control.h [moved from base/dali-toolkit/public-api/controls/control.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/check-button-factory.h [moved from base/dali-toolkit/public-api/controls/default-controls/check-button-factory.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/push-button-factory.h [moved from base/dali-toolkit/public-api/controls/default-controls/push-button-factory.h with 100% similarity]
dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp [moved from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp with 100% similarity]
dali-toolkit/public-api/controls/default-controls/solid-color-actor.h [moved from base/dali-toolkit/public-api/controls/default-controls/solid-color-actor.h with 100% similarity]
dali-toolkit/public-api/controls/effects-view/effects-view.cpp [moved from optional/dali-toolkit/public-api/controls/effects-view/effects-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/effects-view/effects-view.h [moved from optional/dali-toolkit/public-api/controls/effects-view/effects-view.h with 100% similarity]
dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp [moved from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h [moved from optional/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h with 100% similarity]
dali-toolkit/public-api/controls/image-view/masked-image-view.cpp [moved from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/image-view/masked-image-view.h [moved from optional/dali-toolkit/public-api/controls/image-view/masked-image-view.h with 100% similarity]
dali-toolkit/public-api/controls/magnifier/magnifier.cpp [moved from optional/dali-toolkit/public-api/controls/magnifier/magnifier.cpp with 100% similarity]
dali-toolkit/public-api/controls/magnifier/magnifier.h [moved from optional/dali-toolkit/public-api/controls/magnifier/magnifier.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.cpp with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/navigation-control.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/page.cpp [moved from optional/dali-toolkit/public-api/controls/navigation-frame/page.cpp with 100% similarity]
dali-toolkit/public-api/controls/navigation-frame/page.h [moved from optional/dali-toolkit/public-api/controls/navigation-frame/page.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-factory.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-factory.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h [moved from optional/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h with 100% similarity]
dali-toolkit/public-api/controls/popup/popup.cpp [moved from base/dali-toolkit/public-api/controls/popup/popup.cpp with 100% similarity]
dali-toolkit/public-api/controls/popup/popup.h [moved from base/dali-toolkit/public-api/controls/popup/popup.h with 100% similarity]
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp [moved from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp with 100% similarity]
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h [moved from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/item-view.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h [moved from base/dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-component.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-component.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-connector.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-connector.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h [moved from base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scrollable.cpp [moved from base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp with 100% similarity]
dali-toolkit/public-api/controls/scrollable/scrollable.h [moved from base/dali-toolkit/public-api/controls/scrollable/scrollable.h with 100% similarity]
dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp [moved from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/shadow-view/shadow-view.h [moved from optional/dali-toolkit/public-api/controls/shadow-view/shadow-view.h with 100% similarity]
dali-toolkit/public-api/controls/slider/slider.cpp [moved from optional/dali-toolkit/public-api/controls/slider/slider.cpp with 100% similarity]
dali-toolkit/public-api/controls/slider/slider.h [moved from optional/dali-toolkit/public-api/controls/slider/slider.h with 100% similarity]
dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp [moved from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h [moved from optional/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h with 100% similarity]
dali-toolkit/public-api/controls/table-view/table-view.cpp [moved from base/dali-toolkit/public-api/controls/table-view/table-view.cpp with 95% similarity]
dali-toolkit/public-api/controls/table-view/table-view.h [moved from base/dali-toolkit/public-api/controls/table-view/table-view.h with 95% similarity]
dali-toolkit/public-api/controls/text-input/text-input.cpp [moved from base/dali-toolkit/public-api/controls/text-input/text-input.cpp with 100% similarity]
dali-toolkit/public-api/controls/text-input/text-input.h [moved from base/dali-toolkit/public-api/controls/text-input/text-input.h with 100% similarity]
dali-toolkit/public-api/controls/text-view/text-view.cpp [moved from base/dali-toolkit/public-api/controls/text-view/text-view.cpp with 100% similarity]
dali-toolkit/public-api/controls/text-view/text-view.h [moved from base/dali-toolkit/public-api/controls/text-view/text-view.h with 100% similarity]
dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp [moved from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.cpp with 100% similarity]
dali-toolkit/public-api/controls/tool-bar/tool-bar.h [moved from optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h with 100% similarity]
dali-toolkit/public-api/controls/view/view.cpp [moved from optional/dali-toolkit/public-api/controls/view/view.cpp with 100% similarity]
dali-toolkit/public-api/controls/view/view.h [moved from optional/dali-toolkit/public-api/controls/view/view.h with 100% similarity]
dali-toolkit/public-api/dali-toolkit-version.cpp [moved from optional/dali-toolkit/public-api/dali-toolkit-version.cpp with 96% similarity]
dali-toolkit/public-api/dali-toolkit-version.h [moved from optional/dali-toolkit/public-api/dali-toolkit-version.h with 100% similarity]
dali-toolkit/public-api/enums.cpp [moved from base/dali-toolkit/public-api/enums.cpp with 100% similarity]
dali-toolkit/public-api/enums.h [moved from base/dali-toolkit/public-api/enums.h with 100% similarity]
dali-toolkit/public-api/file.list [new file with mode: 0755]
dali-toolkit/public-api/focus-manager/focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/focus-manager.h with 100% similarity]
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h with 100% similarity]
dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp [moved from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.cpp with 100% similarity]
dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h [moved from base/dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h with 100% similarity]
dali-toolkit/public-api/markup-processor/markup-processor.cpp [moved from base/dali-toolkit/public-api/markup-processor/markup-processor.cpp with 100% similarity]
dali-toolkit/public-api/markup-processor/markup-processor.h [moved from base/dali-toolkit/public-api/markup-processor/markup-processor.h with 100% similarity]
dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/alpha-discard-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/alpha-discard-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bendy-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bendy-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bendy-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/bendy-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/blind-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/blind-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/blind-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/blind-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bouncing-effect.cpp [moved from base/dali-toolkit/public-api/shader-effects/bouncing-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bouncing-effect.h [moved from base/dali-toolkit/public-api/shader-effects/bouncing-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h [moved from optional/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h with 100% similarity]
dali-toolkit/public-api/shader-effects/carousel-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/carousel-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/carousel-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/displacement-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/displacement-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/displacement-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/displacement-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-effect.h [moved from base/dali-toolkit/public-api/shader-effects/dissolve-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/dissolve-local-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/dissolve-local-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/distance-field-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/distance-field-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/distance-field-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/image-region-effect.cpp [moved from base/dali-toolkit/public-api/shader-effects/image-region-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/image-region-effect.h [moved from base/dali-toolkit/public-api/shader-effects/image-region-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/iris-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/iris-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/iris-effect.h [moved from base/dali-toolkit/public-api/shader-effects/iris-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/mask-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/mask-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/mask-effect.h [moved from base/dali-toolkit/public-api/shader-effects/mask-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/mirror-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/mirror-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/mirror-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/mirror-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-blur-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/motion-blur-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/motion-stretch-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/motion-stretch-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h [moved from base/dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/overlay-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/overlay-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/overlay-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/overlay-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h [moved from base/dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/page-turn-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/page-turn-effect.h [moved from base/dali-toolkit/public-api/shader-effects/page-turn-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/ripple-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple-effect.h [moved from base/dali-toolkit/public-api/shader-effects/ripple-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/ripple2d-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/ripple2d-effect.h [moved from base/dali-toolkit/public-api/shader-effects/ripple2d-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/shear-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/shear-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/shear-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/shear-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/soft-button-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/soft-button-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/soft-button-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/spot-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/spot-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/spot-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/spot-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/square-dissolve-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/square-dissolve-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/swirl-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/swirl-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/swirl-effect.h [moved from base/dali-toolkit/public-api/shader-effects/swirl-effect.h with 100% similarity]
dali-toolkit/public-api/shader-effects/water-effect.cpp [moved from optional/dali-toolkit/public-api/shader-effects/water-effect.cpp with 100% similarity]
dali-toolkit/public-api/shader-effects/water-effect.h [moved from optional/dali-toolkit/public-api/shader-effects/water-effect.h with 100% similarity]
dali-toolkit/public-api/styling/style-manager.cpp [moved from base/dali-toolkit/public-api/styling/style-manager.cpp with 100% similarity]
dali-toolkit/public-api/styling/style-manager.h [moved from base/dali-toolkit/public-api/styling/style-manager.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.cpp with 100% similarity]
dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h [moved from optional/dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h with 100% similarity]
dali-toolkit/sounds/End_of_List.ogg [moved from base/dali-toolkit/sounds/End_of_List.ogg with 100% similarity]
dali-toolkit/sounds/Focus.ogg [moved from base/dali-toolkit/sounds/Focus.ogg with 100% similarity]
dali-toolkit/sounds/List_scroll.ogg [moved from base/dali-toolkit/sounds/List_scroll.ogg with 100% similarity]
dali-toolkit/sounds/file.list [new file with mode: 0644]
dali-toolkit/styles/file.list [moved from base/dali-toolkit/styles/file.list with 58% similarity]
dali-toolkit/styles/tizen-dark-theme.json [moved from base/dali-toolkit/styles/tizen-dark-theme.json with 100% similarity]
dali-toolkit/styles/tizen-default-theme.json [moved from base/dali-toolkit/styles/tizen-default-theme.json with 100% similarity]
optional/dali-toolkit/images/file.list [deleted file]
optional/dali-toolkit/internal/file.list [deleted file]
optional/dali-toolkit/public-api/file.list [deleted file]
packaging/dali-toolkit.spec

index 227f4af..5a88e73 100644 (file)
@@ -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})
index 7fe943a..b32c92e 100644 (file)
@@ -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<Vector3>( 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>(), Vector2(6.f,8.f), TEST_LOCATION );
 
-  // Test "layout-animation-duration" property
-  DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ANIMATION_DURATION) == TableView::PROPERTY_LAYOUT_ANIMATION_DURATION );
-
-  tableView.SetProperty( TableView::PROPERTY_LAYOUT_ANIMATION_DURATION, 1.5f );
-
-  DALI_TEST_EQUALS( tableView.GetLayoutAnimationDuration(), 1.5f, TEST_LOCATION );
-  DALI_TEST_EQUALS( tableView.GetProperty(TableView::PROPERTY_LAYOUT_ANIMATION_DURATION).Get<float>(), 1.5f, TEST_LOCATION );
-
   //{ "policy": "fixed", "value": 30.0 },
   Property::Map item1;
   item1[ "policy" ] = "fixed";
diff --git a/base/dali-toolkit/images/file.list b/base/dali-toolkit/images/file.list
deleted file mode 100644 (file)
index 2eec674..0000000
+++ /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 (file)
index 1966d8d..0000000
+++ /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 (executable)
index 9537d61..0000000
+++ /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 (file)
index 74ee1c1..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Files to install here
-
-dali_toolkit_base_sound_files =\
-       $(toolkit_base_sounds_dir)/*.ogg
index 454053f..4c4afda 100644 (file)
@@ -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
index 86111b2..aab631d 100644 (file)
 
 # 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)
index 33e5418..92ff833 100644 (file)
@@ -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
 
similarity index 98%
rename from optional/dali-toolkit/dali-toolkit.h
rename to dali-toolkit/dali-toolkit.h
index 91bdcca..942e62d 100644 (file)
@@ -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.
 // Toolkit
 
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
+#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
+#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 #include <dali-toolkit/public-api/controls/cluster/cluster-style.h>
+#include <dali-toolkit/public-api/controls/cluster/cluster.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
-#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
-#include <dali-toolkit/public-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
-#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
-#include <dali-toolkit/public-api/controls/text-input/text-input.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
-#include <dali-toolkit/public-api/enums.h>
-#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
-#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
-#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
-#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
-#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
-#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
-#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
-
-// INTERNAL INCLUDES
-
-#include <dali-toolkit/public-api/controls/bloom-view/bloom-view.h>
-#include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
-#include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
-#include <dali-toolkit/public-api/controls/cluster/cluster.h>
-
 #include <dali-toolkit/public-api/controls/default-controls/check-button-factory.h>
-
+#include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
+#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
 #include <dali-toolkit/public-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 #include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
+#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
+#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-
+#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/public-api/controls/popup/popup.h>
 #include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-connector.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/depth-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/roll-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/spiral-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-carousel-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-cube-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-depth-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-wobble-effect.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
 #include <dali-toolkit/public-api/controls/slider/slider.h>
+#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/public-api/controls/text-input/text-input.h>
+#include <dali-toolkit/public-api/controls/text-view/text-view.h>
 #include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>
 #include <dali-toolkit/public-api/controls/view/view.h>
 
-#include <dali-toolkit/public-api/controls/navigation-frame/navigation-control.h>
-#include <dali-toolkit/public-api/controls/navigation-frame/page.h>
-
+#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 #include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
 
+#include <dali-toolkit/public-api/markup-processor/markup-processor.h>
+
 #include <dali-toolkit/public-api/shader-effects/alpha-discard-effect.h>
 #include <dali-toolkit/public-api/shader-effects/bendy-effect.h>
 #include <dali-toolkit/public-api/shader-effects/blind-effect.h>
 #include <dali-toolkit/public-api/shader-effects/water-effect.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h>
 #include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
+#include <dali-toolkit/public-api/shader-effects/dissolve-effect.h>
+#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/public-api/shader-effects/iris-effect.h>
+#include <dali-toolkit/public-api/shader-effects/mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/nine-patch-mask-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-book-spine-effect.h>
+#include <dali-toolkit/public-api/shader-effects/page-turn-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple-effect.h>
+#include <dali-toolkit/public-api/shader-effects/ripple2d-effect.h>
+#include <dali-toolkit/public-api/shader-effects/swirl-effect.h>
 
 #include <dali-toolkit/public-api/transition-effects/cube-transition-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-wave-effect.h>
 #include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
 
 #include <dali-toolkit/public-api/dali-toolkit-version.h>
+#include <dali-toolkit/public-api/enums.h>
 
-#endif // __DALI_TOOLKIT_EXT_H__
+#endif // __DALI_TOOLKIT_H__
diff --git a/dali-toolkit/images/file.list b/dali-toolkit/images/file.list
new file mode 100644 (file)
index 0000000..dbc5012
--- /dev/null
@@ -0,0 +1,4 @@
+# Files to install here
+
+dali_toolkit_image_files =\
+    $(toolkit_images_dir)/*.png
@@ -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<Vector3>( Actor::POSITION,
-                                                    LocalSource( Actor::SIZE ),
-                                                    ParentSource( Actor::SIZE ),
-                                                    PositionConstraint( padding, horizontal, vertical ) );
-  actor.ApplyConstraint( constraint );
-}
 } // namespace
 
 Toolkit::Alignment Alignment::New( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
@@ -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 );
   }
 }
 
@@ -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<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
   self.Add(mLayer);
 
   mPopupBg = Actor::New();
   mPopupBg.SetParentOrigin(ParentOrigin::CENTER);
   mPopupBg.SetAnchorPoint(AnchorPoint::CENTER);
-  mPopupBg.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
   mLayer.Add(mPopupBg);
 
   // Any content after this point which is added to Self() will be reparented to
@@ -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<Vector3>( Actor::SIZE,
-                                                      ParentSource( Actor::SIZE ),
-                                                      BackgroundSizeConstraint(outerBorder) );
-
-    mBackgroundImage.RemoveConstraints();
-    mBackgroundImage.ApplyConstraint( constraint );
-
+    mBackgroundImage.SetSize(BackgroundSize(outerBorder, Vector3(size)));
     mBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mBackgroundImage.SetPosition( -outerBorder.x, -outerBorder.y, 0.0f );
@@ -704,13 +674,7 @@ void Popup::OnRelayout( const Vector2& size, ActorSizeContainer& container )
     }
     else
     {
-      Constraint constraint = Constraint::New<Vector3>( Actor::SIZE,
-                                                      ParentSource( Actor::SIZE ),
-                                                      ButtonAreaSizeConstraint(outerBorder) );
-
-      mButtonAreaImage.RemoveConstraints();
-      mButtonAreaImage.ApplyConstraint( constraint );
-
+      mButtonAreaImage.SetSize( ButtonAreaSize(outerBorder, Vector3(size)) );
       mButtonAreaImage.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
       mButtonAreaImage.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
       mButtonAreaImage.SetY( -outerBorder.z - POPUP_OUT_MARGIN_HEIGHT );
@@ -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;
   }
 
@@ -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 );
 
@@ -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<Vector3>( 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<Vector3>(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
@@ -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.
 
@@ -20,8 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
-#include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/scripting/scripting.h>
@@ -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<float>( Actor::POSITION_X,
-                                                             ParentSource( Actor::SIZE_WIDTH ),
-                                                             RelativeToWidthOrHeight( relativePosition.x, positionPadding.x, fixedPosition.x ) );
-
-        Constraint heightConstraint = Constraint::New<float>( Actor::POSITION_Y,
-                                                              ParentSource( Actor::SIZE_HEIGHT ),
-                                                              RelativeToWidthOrHeight( relativePosition.y, positionPadding.y, fixedPosition.y ) );
-
-        widthConstraint.SetApplyTime( mConstraintDuration );
-        heightConstraint.SetApplyTime( mConstraintDuration );
-
-        // bake constrained position value if constraint is removed
-        widthConstraint.SetRemoveAction( Constraint::Bake );
-        heightConstraint.SetRemoveAction( Constraint::Bake );
-
-        actor.ApplyConstraint( widthConstraint );
-        actor.ApplyConstraint( heightConstraint );
+        Vector3 actorPosition( RelativeToSize( relativePosition, positionPadding, fixedPosition, size ) );
+        actor.SetPosition( actorPosition );
 
         // 2. set size
         // constrain the actor size to be relative to the size of table
@@ -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<float>( Actor::SIZE_WIDTH,
-                                                  ParentSource( Actor::SIZE_WIDTH ),
-                                                  relativeWidthFunctor );
-
-        heightConstraint = Constraint::New<float>( Actor::SIZE_HEIGHT,
-                                                   ParentSource( Actor::SIZE_HEIGHT ),
-                                                   relativeHeightFunctor );
-
-        widthConstraint.SetApplyTime( mConstraintDuration );
-        heightConstraint.SetApplyTime( mConstraintDuration );
-
-        // bake constrained size value if constraint is removed
-        widthConstraint.SetRemoveAction( Constraint::Bake );
-        heightConstraint.SetRemoveAction( Constraint::Bake );
-
-        actor.ApplyConstraint( widthConstraint );
-        actor.ApplyConstraint( heightConstraint );
+        Vector2 actorSize( RelativeToSize( relativeSize, sizePadding, fixedSize, size ) );
+        actor.SetSize(actorSize.x, actorSize.y);
 
         // Relayout Children
-        Relayout ( actor, Vector2( relativeWidthFunctor( size.width ), relativeHeightFunctor( size.height ) ), container );
+        Relayout ( actor, actorSize, container );
       }
       // for position we need to keep track of current fixed width and relative width
       // increase for next column
@@ -807,11 +738,6 @@ void TableView::SetProperty( BaseObject* object, Property::Index index, const Pr
         tableViewImpl.SetCellPadding( value.Get<Vector2>() );
         break;
       }
-      case Toolkit::TableView::PROPERTY_LAYOUT_ANIMATION_DURATION:
-      {
-        tableViewImpl.SetLayoutAnimationDuration( value.Get<float>() );
-        break;
-      }
       case Toolkit::TableView::PROPERTY_LAYOUT_ROWS:
       {
         SetHeightOrWidthProperty( tableViewImpl, &TableView::SetFixedHeight, &TableView::SetRelativeHeight, value );
@@ -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 );
@@ -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<float> mRelativeWidths;
   Size mPadding;
   bool mLayoutingChild;
-  float mConstraintDuration;
 
 };
 
diff --git