From: Paul Wisbey Date: Fri, 13 Feb 2015 17:36:36 +0000 (+0000) Subject: Merge remote-tracking branch 'origin/tizen' into new_text X-Git-Tag: new_text_0.1~47 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 Merge remote-tracking branch 'origin/tizen' into new_text Conflicts: base/dali-toolkit/internal/file.list base/dali-toolkit/public-api/file.list build/tizen/dali-toolkit/Makefile.am dali-toolkit/dali-toolkit.h dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp dali-toolkit/internal/controls/text-input/text-input-handles-impl.h dali-toolkit/internal/controls/text-input/text-input-impl.cpp dali-toolkit/internal/controls/text-input/text-input-impl.h dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp dali-toolkit/internal/controls/text-input/text-input-popup-impl.h dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h dali-toolkit/internal/controls/text-view/relayout-utilities.cpp dali-toolkit/internal/controls/text-view/relayout-utilities.h dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp dali-toolkit/internal/controls/text-view/split-by-char-policies.h dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp dali-toolkit/internal/controls/text-view/split-by-word-policies.h dali-toolkit/internal/controls/text-view/text-actor-cache.cpp dali-toolkit/internal/controls/text-view/text-actor-cache.h dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h dali-toolkit/internal/controls/text-view/text-processor.cpp dali-toolkit/internal/controls/text-view/text-processor.h dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp dali-toolkit/internal/controls/text-view/text-view-impl.cpp dali-toolkit/internal/controls/text-view/text-view-impl.h dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h dali-toolkit/internal/controls/text-view/text-view-processor-types.h dali-toolkit/internal/controls/text-view/text-view-processor.cpp dali-toolkit/internal/controls/text-view/text-view-processor.h dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp dali-toolkit/internal/controls/text-view/text-view-word-processor.h dali-toolkit/public-api/controls/text-input/text-input.cpp dali-toolkit/public-api/controls/text-input/text-input.h dali-toolkit/public-api/controls/text-view/text-view.cpp dali-toolkit/public-api/controls/text-view/text-view.h dali-toolkit/public-api/markup-processor/markup-processor.cpp dali-toolkit/public-api/markup-processor/markup-processor.h Change-Id: I9f3dcc5bba104f4cac0589eddad4ad1de31cc740 --- 306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 diff --cc build/tizen/dali-toolkit/Makefile.am index 3be1007,aab631d..7f49efa --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@@ -98,102 -68,84 +68,89 @@@ 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 - publicapibasetextcontrolsdir = $(publicapibasedir)/controls/text-controls - publicapibasetextdir = $(publicapibasedir)/text - publicapibasetextlayoutsdir = $(publicapibasedir)/text/layouts - publicapibasetextrenderingdir = $(publicapibasedir)/text/rendering - publicapibasetextrenderingbasicdir = $(publicapibasedir)/text/rendering/basic - publicapibasetextrenderingshadersdir = $(publicapibasedir)/text/rendering/shaders - 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) - publicapibasetextcontrols_HEADERS = $(public_api_base_text_controls_header_files) - publicapibasetext_HEADERS = $(public_api_base_text_header_files) - publicapibasetextlayouts_HEADERS = $(public_api_base_text_layouts_header_files) - publicapibasetextrendering_HEADERS = $(public_api_base_text_rendering_header_files) - publicapibasetextrenderingbasic_HEADERS = $(public_api_base_text_rendering_basic_header_files) - publicapibasetextrenderingshaders_HEADERS = $(public_api_base_text_rendering_shaders_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 ++publicapitextcontrolsdir = $(publicapidir)/controls/text-controls ++publicapitextdir = $(publicapidir)/text ++publicapitextlayoutsdir = $(publicapidir)/text/layouts ++publicapitextrenderingdir = $(publicapidir)/text/rendering ++publicapitextrenderingbasicdir = $(publicapidir)/text/rendering/basic ++publicapitextrenderingshadersdir = $(publicapidir)/text/rendering/shaders + 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) ++publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files) ++publicapitext_HEADERS = $(public_api_text_header_files) ++publicapitextlayouts_HEADERS = $(public_api_text_layouts_header_files) ++publicapitextrendering_HEADERS = $(public_api_text_rendering_header_files) ++publicapitextrenderingbasic_HEADERS = $(public_api_text_rendering_basic_header_files) ++publicapitextrenderingshaders_HEADERS = $(public_api_text_rendering_shaders_header_files) + publicapitoolbar_HEADERS = $(public_api_tool_bar_header_files) + publicapiview_HEADERS = $(public_api_view_header_files) - + publicapibuilder_HEADERS = $(public_api_builder_header_files) + publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files) -publicapimarkupprocessor_HEADERS = $(public_api_markup_processor_header_files) + publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files) + publicapibubbleeffect_HEADERS = $(public_api_bubble_effect_header_files) + publicapistyling_HEADERS = $(public_api_styling_header_files) + publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files) ++ diff --cc dali-toolkit/dali-toolkit.h index 772bb85,942e62d..350043e --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@@ -101,21 -61,30 +61,27 @@@ #include #include #include + #include #include + #include #include #include + #include #include + #include + #include #include #include + #include #include -#include -#include ++#include #include #include - #include - #include - + #include + #include #include -#include - #include #include #include @@@ -135,7 -104,17 +101,37 @@@ #include #include #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include #include #include diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index c498f0e,0000000..c498f0e mode 100644,000000..100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.h index 3ea01f2,0000000..3ea01f2 mode 100644,000000..100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h diff --cc dali-toolkit/internal/file.list index 0000000,da91a77..a760e1a mode 000000,100644..100644 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@@ -1,0 -1,99 +1,82 @@@ + # Add local source files here + + toolkit_src_files = \ + $(toolkit_src_dir)/builder/builder-actor.cpp \ + $(toolkit_src_dir)/builder/builder-animations.cpp \ + $(toolkit_src_dir)/builder/builder-impl.cpp \ + $(toolkit_src_dir)/builder/builder-set-property.cpp \ + $(toolkit_src_dir)/builder/builder-signals.cpp \ + $(toolkit_src_dir)/builder/json-parser-state.cpp \ + $(toolkit_src_dir)/builder/json-parser-impl.cpp \ + $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \ + $(toolkit_src_dir)/builder/replacement.cpp \ + $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \ + $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \ + $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/button-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/check-box-button-default-painter-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/check-box-button-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/push-button-default-painter-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \ + $(toolkit_src_dir)/controls/buttons/radio-button-impl.cpp \ + $(toolkit_src_dir)/controls/cluster/cluster-impl.cpp \ + $(toolkit_src_dir)/controls/cluster/cluster-style-impl.cpp \ + $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \ + $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \ + $(toolkit_src_dir)/controls/image-view/masked-image-view-impl.cpp \ + $(toolkit_src_dir)/controls/magnifier/magnifier-impl.cpp \ + $(toolkit_src_dir)/controls/navigation-frame/navigation-bar.cpp \ + $(toolkit_src_dir)/controls/navigation-frame/navigation-control-impl.cpp \ + $(toolkit_src_dir)/controls/navigation-frame/navigation-title-bar.cpp \ + $(toolkit_src_dir)/controls/navigation-frame/navigation-tool-bar.cpp \ + $(toolkit_src_dir)/controls/navigation-frame/page-impl.cpp \ + $(toolkit_src_dir)/controls/popup/popup-impl.cpp \ + $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \ + $(toolkit_src_dir)/controls/page-turn-view/page-turn-portrait-view-impl.cpp \ + $(toolkit_src_dir)/controls/page-turn-view/page-turn-landscape-view-impl.cpp \ + $(toolkit_src_dir)/controls/page-turn-view/page-turn-view-impl.cpp \ + $(toolkit_src_dir)/controls/relayout-controller-impl.cpp \ + $(toolkit_src_dir)/controls/relayout-controller.cpp \ + $(toolkit_src_dir)/controls/relayout-helper.cpp \ + $(toolkit_src_dir)/controls/scroll-bar/scroll-bar-impl.cpp \ + $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal-impl.cpp \ + $(toolkit_src_dir)/controls/scroll-component/scroll-bar-internal.cpp \ + $(toolkit_src_dir)/controls/scrollable/bouncing-effect-actor.cpp \ + $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-connector-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-helper-functions.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect-impl.cpp \ + $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect-impl.cpp \ + $(toolkit_src_dir)/controls/shadow-view/shadow-view-impl.cpp \ + $(toolkit_src_dir)/controls/slider/slider-impl.cpp \ + $(toolkit_src_dir)/controls/super-blur-view/super-blur-view-impl.cpp \ + $(toolkit_src_dir)/controls/table-view/table-view-impl.cpp \ - $(toolkit_src_dir)/controls/text-input/text-input-decorator-impl.cpp \ - $(toolkit_src_dir)/controls/text-input/text-input-handles-impl.cpp \ - $(toolkit_src_dir)/controls/text-input/text-input-impl.cpp \ - $(toolkit_src_dir)/controls/text-input/text-input-popup-impl.cpp \ - $(toolkit_src_dir)/controls/text-input/text-input-text-highlight-impl.cpp \ - $(toolkit_src_dir)/controls/text-view/relayout-utilities.cpp \ - $(toolkit_src_dir)/controls/text-view/split-by-char-policies.cpp \ - $(toolkit_src_dir)/controls/text-view/split-by-new-line-char-policies.cpp \ - $(toolkit_src_dir)/controls/text-view/split-by-word-policies.cpp \ - $(toolkit_src_dir)/controls/text-view/text-actor-cache.cpp \ - $(toolkit_src_dir)/controls/text-view/text-processor-bidirectional-info.cpp \ - $(toolkit_src_dir)/controls/text-view/text-processor.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-character-processor.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-impl.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-paragraph-processor.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-processor-dbg.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-processor-helper-functions.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-processor.cpp \ - $(toolkit_src_dir)/controls/text-view/text-view-word-processor.cpp \ ++ $(toolkit_src_dir)/controls/text-controls/text-label-impl.cpp \ + $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \ + $(toolkit_src_dir)/controls/view/view-impl.cpp \ + $(toolkit_src_dir)/focus-manager/focus-manager-impl.cpp \ + $(toolkit_src_dir)/focus-manager/keyboard-focus-manager-impl.cpp \ + $(toolkit_src_dir)/focus-manager/keyinput-focus-manager-impl.cpp \ + $(toolkit_src_dir)/filters/blur-two-pass-filter.cpp \ + $(toolkit_src_dir)/filters/emboss-filter.cpp \ + $(toolkit_src_dir)/filters/image-filter.cpp \ + $(toolkit_src_dir)/filters/spread-filter.cpp \ + $(toolkit_src_dir)/shader-effects/page-turn-effect-impl.cpp \ + $(toolkit_src_dir)/shader-effects/water-effect-impl.cpp \ + $(toolkit_src_dir)/styling/style-manager-impl.cpp \ ++ $(toolkit_src_dir)/text/multi-language-support-impl.cpp \ + $(toolkit_src_dir)/transition-effects/cube-transition-effect-impl.cpp \ + $(toolkit_src_dir)/transition-effects/cube-transition-cross-effect-impl.cpp \ + $(toolkit_src_dir)/transition-effects/cube-transition-fold-effect-impl.cpp \ + $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp + diff --cc dali-toolkit/internal/text/multi-language-support-impl.cpp index 4143b03,0000000..4143b03 mode 100644,000000..100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.cpp +++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp diff --cc dali-toolkit/internal/text/multi-language-support-impl.h index f527031,0000000..f527031 mode 100644,000000..100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.h +++ b/dali-toolkit/internal/text/multi-language-support-impl.h diff --cc dali-toolkit/public-api/controls/text-controls/text-label.cpp index 15bb52c,0000000..15bb52c mode 100644,000000..100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.cpp +++ b/dali-toolkit/public-api/controls/text-controls/text-label.cpp diff --cc dali-toolkit/public-api/controls/text-controls/text-label.h index 449d23b,0000000..449d23b mode 100644,000000..100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h diff --cc dali-toolkit/public-api/file.list index 0000000,1b9307a..b8f75bc mode 000000,100755..100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@@ -1,0 -1,274 +1,316 @@@ + # Add local source files here + + public_api_src_files = \ + $(public_api_src_dir)/builder/builder.cpp \ + $(public_api_src_dir)/builder/json-parser.cpp \ + $(public_api_src_dir)/builder/tree-node.cpp \ + $(public_api_src_dir)/controls/control-impl.cpp \ + $(public_api_src_dir)/controls/control.cpp \ + $(public_api_src_dir)/controls/alignment/alignment.cpp \ + $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \ + $(public_api_src_dir)/controls/buttons/button.cpp \ + $(public_api_src_dir)/controls/buttons/check-box-button.cpp \ + $(public_api_src_dir)/controls/buttons/push-button.cpp \ + $(public_api_src_dir)/controls/buttons/radio-button.cpp \ + $(public_api_src_dir)/controls/default-controls/check-button-factory.cpp \ + $(public_api_src_dir)/controls/default-controls/push-button-factory.cpp \ + $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \ + $(public_api_src_dir)/controls/navigation-frame/navigation-control.cpp \ + $(public_api_src_dir)/controls/navigation-frame/page.cpp \ + $(public_api_src_dir)/controls/magnifier/magnifier.cpp \ + $(public_api_src_dir)/controls/page-turn-view/page-factory.cpp \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \ + $(public_api_src_dir)/controls/popup/popup.cpp \ + $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-connector.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-component-impl.cpp \ + $(public_api_src_dir)/controls/scrollable/scroll-component.cpp \ + $(public_api_src_dir)/controls/scrollable/scrollable.cpp \ + $(public_api_src_dir)/controls/shadow-view/shadow-view.cpp \ + $(public_api_src_dir)/controls/slider/slider.cpp \ + $(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \ + $(public_api_src_dir)/controls/table-view/table-view.cpp \ - $(public_api_src_dir)/controls/text-input/text-input.cpp \ - $(public_api_src_dir)/controls/text-view/text-view.cpp \ ++ $(public_api_src_dir)/controls/text-controls/text-label.cpp \ + $(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \ + $(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \ + $(public_api_src_dir)/controls/cluster/cluster-style.cpp \ + $(public_api_src_dir)/controls/cluster/cluster.cpp \ + $(public_api_src_dir)/controls/effects-view/effects-view.cpp \ + $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \ + $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \ + $(public_api_src_dir)/controls/view/view.cpp \ + $(public_api_src_dir)/focus-manager/focus-manager.cpp \ + $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \ + $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \ - $(public_api_src_dir)/markup-processor/markup-processor.cpp \ + $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \ + $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \ + $(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \ + $(public_api_src_dir)/shader-effects/bendy-effect.cpp \ + $(public_api_src_dir)/shader-effects/blind-effect.cpp \ + $(public_api_src_dir)/shader-effects/bouncing-effect.cpp \ + $(public_api_src_dir)/shader-effects/carousel-effect.cpp \ + $(public_api_src_dir)/shader-effects/displacement-effect.cpp \ + $(public_api_src_dir)/shader-effects/dissolve-effect.cpp \ + $(public_api_src_dir)/shader-effects/dissolve-local-effect.cpp \ + $(public_api_src_dir)/shader-effects/distance-field-effect.cpp \ + $(public_api_src_dir)/shader-effects/image-region-effect.cpp \ + $(public_api_src_dir)/shader-effects/iris-effect.cpp \ + $(public_api_src_dir)/shader-effects/mask-effect.cpp \ + $(public_api_src_dir)/shader-effects/mirror-effect.cpp \ + $(public_api_src_dir)/shader-effects/motion-blur-effect.cpp \ + $(public_api_src_dir)/shader-effects/motion-stretch-effect.cpp \ + $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \ + $(public_api_src_dir)/shader-effects/overlay-effect.cpp \ + $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \ + $(public_api_src_dir)/shader-effects/page-turn-effect.cpp \ + $(public_api_src_dir)/shader-effects/ripple-effect.cpp \ + $(public_api_src_dir)/shader-effects/ripple2d-effect.cpp \ + $(public_api_src_dir)/shader-effects/shear-effect.cpp \ + $(public_api_src_dir)/shader-effects/soft-button-effect.cpp \ + $(public_api_src_dir)/shader-effects/spot-effect.cpp \ + $(public_api_src_dir)/shader-effects/square-dissolve-effect.cpp \ + $(public_api_src_dir)/shader-effects/swirl-effect.cpp \ + $(public_api_src_dir)/shader-effects/water-effect.cpp \ + $(public_api_src_dir)/styling/style-manager.cpp \ ++ $(public_api_src_dir)/text/bidirectional-support.cpp \ ++ $(public_api_src_dir)/text/character-set-conversion.cpp \ ++ $(public_api_src_dir)/text/logical-model.cpp \ ++ $(public_api_src_dir)/text/multi-language-support.cpp \ ++ $(public_api_src_dir)/text/script.cpp \ ++ $(public_api_src_dir)/text/segmentation.cpp \ ++ $(public_api_src_dir)/text/text-controller.cpp \ ++ $(public_api_src_dir)/text/text-view.cpp \ ++ $(public_api_src_dir)/text/text-view-interface.cpp \ ++ $(public_api_src_dir)/text/visual-model.cpp \ ++ $(public_api_src_dir)/text/layouts/layout-engine.cpp \ ++ $(public_api_src_dir)/text/rendering/text-renderer.cpp \ ++ $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.cpp \ ++ $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.cpp \ + $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \ + $(public_api_src_dir)/transition-effects/cube-transition-effect.cpp \ + $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ + $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \ + $(public_api_src_dir)/dali-toolkit-version.cpp \ + $(public_api_src_dir)/enums.cpp + + # Add public header files here + + public_api_header_files = \ + $(public_api_src_dir)/dali-toolkit-version.h \ + $(public_api_src_dir)/enums.h + + public_api_builder_header_files = \ + $(public_api_src_dir)/builder/builder.h \ + $(public_api_src_dir)/builder/json-parser.h \ + $(public_api_src_dir)/builder/tree-node.h + + public_api_controls_header_files = \ + $(public_api_src_dir)/controls/control-impl.h \ + $(public_api_src_dir)/controls/control.h + + public_api_alignment_header_files = \ + $(public_api_src_dir)/controls/alignment/alignment.h + + public_api_buttons_header_files = \ + $(public_api_src_dir)/controls/buttons/button.h \ + $(public_api_src_dir)/controls/buttons/check-box-button.h \ + $(public_api_src_dir)/controls/buttons/push-button.h \ + $(public_api_src_dir)/controls/buttons/radio-button.h + + public_api_bloom_view_header_files = \ + $(public_api_src_dir)/controls/bloom-view/bloom-view.h + + public_api_bubble_emitter_header_files = \ + $(public_api_src_dir)/controls/bubble-effect/bubble-emitter.h + + public_api_cluster_header_files = \ + $(public_api_src_dir)/controls/cluster/cluster-style.h \ + $(public_api_src_dir)/controls/cluster/cluster.h + + public_api_default_controls_header_files = \ + $(public_api_src_dir)/controls/default-controls/check-button-factory.h \ + $(public_api_src_dir)/controls/default-controls/push-button-factory.h \ + $(public_api_src_dir)/controls/default-controls/solid-color-actor.h + + public_api_effects_view_header_files = \ + $(public_api_src_dir)/controls/effects-view/effects-view.h + + public_api_gaussian_blur_view_header_files = \ + $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h + + public_api_image_view_header_files = \ + $(public_api_src_dir)/controls/image-view/masked-image-view.h + + public_api_item_view_header_files = \ + $(public_api_src_dir)/controls/scrollable/item-view/depth-layout.h \ + $(public_api_src_dir)/controls/scrollable/item-view/grid-layout.h \ + $(public_api_src_dir)/controls/scrollable/item-view/item-factory.h \ + $(public_api_src_dir)/controls/scrollable/item-view/item-layout.h \ + $(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \ + $(public_api_src_dir)/controls/scrollable/item-view/item-view.h \ + $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \ + $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \ + $(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h + + public_api_magnifier_header_files = \ + $(public_api_src_dir)/controls/magnifier/magnifier.h + + public_api_page_turn_view_header_files = \ + $(public_api_src_dir)/controls/page-turn-view/page-factory.h \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \ + $(public_api_src_dir)/controls/page-turn-view/page-turn-view.h + + public_api_popup_header_files = \ + $(public_api_src_dir)/controls/popup/popup.h + + public_api_scrollable_header_files = \ + $(public_api_src_dir)/controls/scrollable/scroll-component-impl.h \ + $(public_api_src_dir)/controls/scrollable/scroll-component.h \ + $(public_api_src_dir)/controls/scrollable/scroll-connector.h \ + $(public_api_src_dir)/controls/scrollable/scrollable.h + + public_api_scroll_bar_header_files = \ + $(public_api_src_dir)/controls/scroll-bar/scroll-bar.h + + public_api_scroll_view_header_files = \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-cube-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-depth-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-carousel-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-cube-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-spiral-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.h \ + $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h + + public_api_slider_header_files = \ + $(public_api_src_dir)/controls/slider/slider.h + + public_api_shadow_view_header_files = \ + $(public_api_src_dir)/controls/shadow-view/shadow-view.h + + public_api_super_blur_view_header_files = \ + $(public_api_src_dir)/controls/super-blur-view/super-blur-view.h + + public_api_table_view_header_files = \ + $(public_api_src_dir)/controls/table-view/table-view.h + ++public_api_text_controls_header_files = \ ++ $(public_api_src_dir)/controls/text-controls/text-label.h ++ ++public_api_text_header_files = \ ++ $(public_api_src_dir)/text/bidirectional-line-info-run.h \ ++ $(public_api_src_dir)/text/bidirectional-paragraph-info-run.h \ ++ $(public_api_src_dir)/text/bidirectional-support.h \ ++ $(public_api_src_dir)/text/character-run.h \ ++ $(public_api_src_dir)/text/character-set-conversion.h \ ++ $(public_api_src_dir)/text/font-run.h \ ++ $(public_api_src_dir)/text/logical-model.h \ ++ $(public_api_src_dir)/text/multi-language-support.h \ ++ $(public_api_src_dir)/text/script.h \ ++ $(public_api_src_dir)/text/script-run.h \ ++ $(public_api_src_dir)/text/segmentation.h \ ++ $(public_api_src_dir)/text/text-controller.h \ ++ $(public_api_src_dir)/text/text-definitions.h \ ++ $(public_api_src_dir)/text/text-view.h \ ++ $(public_api_src_dir)/text/text-view-interface.h \ ++ $(public_api_src_dir)/text/visual-model.h ++ ++public_api_text_layouts_header_files = \ ++ $(public_api_src_dir)/text/layouts/layout-engine.h ++ ++public_api_text_rendering_header_files = \ ++ $(public_api_src_dir)/text/rendering/text-renderer.h ++ ++public_api_text_rendering_basic_header_files = \ ++ $(public_api_src_dir)/text/rendering/basic/text-basic-renderer.h ++ ++public_api_text_rendering_shaders_header_files = \ ++ $(public_api_src_dir)/text/rendering/shaders/text-basic-shader.h ++ + public_api_text_input_header_files = \ + $(public_api_src_dir)/controls/text-input/text-input.h + + public_api_text_view_header_files = \ + $(public_api_src_dir)/controls/text-view/text-view.h + + public_api_tool_bar_header_files = \ + $(public_api_src_dir)/controls/tool-bar/tool-bar.h + + public_api_navigation_frame_header_files = \ + $(public_api_src_dir)/controls/navigation-frame/navigation-bar-style.h \ + $(public_api_src_dir)/controls/navigation-frame/navigation-control.h \ + $(public_api_src_dir)/controls/navigation-frame/page.h + + public_api_view_header_files = \ + $(public_api_src_dir)/controls/view/view.h + + public_api_focus_manager_header_files = \ + $(public_api_src_dir)/focus-manager/focus-manager.h \ + $(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \ + $(public_api_src_dir)/focus-manager/keyinput-focus-manager.h + -public_api_markup_processor_header_files = \ - $(public_api_src_dir)/markup-processor/markup-processor.h - + public_api_shader_effects_header_files = \ + $(public_api_src_dir)/shader-effects/alpha-discard-effect.h \ + $(public_api_src_dir)/shader-effects/bendy-effect.h \ + $(public_api_src_dir)/shader-effects/blind-effect.h \ + $(public_api_src_dir)/shader-effects/bouncing-effect.h \ + $(public_api_src_dir)/shader-effects/carousel-effect.h \ + $(public_api_src_dir)/shader-effects/displacement-effect.h \ + $(public_api_src_dir)/shader-effects/dissolve-effect.h \ + $(public_api_src_dir)/shader-effects/dissolve-local-effect.h \ + $(public_api_src_dir)/shader-effects/distance-field-effect.h \ + $(public_api_src_dir)/shader-effects/image-region-effect.h \ + $(public_api_src_dir)/shader-effects/iris-effect.h \ + $(public_api_src_dir)/shader-effects/mask-effect.h \ + $(public_api_src_dir)/shader-effects/mirror-effect.h \ + $(public_api_src_dir)/shader-effects/motion-blur-effect.h \ + $(public_api_src_dir)/shader-effects/motion-stretch-effect.h \ + $(public_api_src_dir)/shader-effects/nine-patch-mask-effect.h \ + $(public_api_src_dir)/shader-effects/overlay-effect.h \ + $(public_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \ + $(public_api_src_dir)/shader-effects/page-turn-effect.h \ + $(public_api_src_dir)/shader-effects/ripple-effect.h \ + $(public_api_src_dir)/shader-effects/ripple2d-effect.h \ + $(public_api_src_dir)/shader-effects/shear-effect.h \ + $(public_api_src_dir)/shader-effects/soft-button-effect.h \ + $(public_api_src_dir)/shader-effects/spot-effect.h \ + $(public_api_src_dir)/shader-effects/square-dissolve-effect.h \ + $(public_api_src_dir)/shader-effects/swirl-effect.h \ + $(public_api_src_dir)/shader-effects/water-effect.h + + public_api_bubble_effect_header_files = \ + $(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \ + $(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h + + public_api_styling_header_files = \ + $(public_api_src_dir)/styling/style-manager.h + + public_api_transition_effects_header_files = \ + $(public_api_src_dir)/transition-effects/cube-transition-effect.h \ + $(public_api_src_dir)/transition-effects/cube-transition-cross-effect.h \ + $(public_api_src_dir)/transition-effects/cube-transition-fold-effect.h \ + $(public_api_src_dir)/transition-effects/cube-transition-wave-effect.h + diff --cc dali-toolkit/public-api/text/bidirectional-line-info-run.h index 46e2fa3,0000000..46e2fa3 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/bidirectional-line-info-run.h +++ b/dali-toolkit/public-api/text/bidirectional-line-info-run.h diff --cc dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h index 055df82,0000000..055df82 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h +++ b/dali-toolkit/public-api/text/bidirectional-paragraph-info-run.h diff --cc dali-toolkit/public-api/text/bidirectional-support.cpp index d328511,0000000..d328511 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/bidirectional-support.cpp +++ b/dali-toolkit/public-api/text/bidirectional-support.cpp diff --cc dali-toolkit/public-api/text/bidirectional-support.h index 5cb557e,0000000..5cb557e mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/bidirectional-support.h +++ b/dali-toolkit/public-api/text/bidirectional-support.h diff --cc dali-toolkit/public-api/text/character-run.h index b0d648e,0000000..b0d648e mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/character-run.h +++ b/dali-toolkit/public-api/text/character-run.h diff --cc dali-toolkit/public-api/text/character-set-conversion.cpp index 88356f4,0000000..88356f4 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/character-set-conversion.cpp +++ b/dali-toolkit/public-api/text/character-set-conversion.cpp diff --cc dali-toolkit/public-api/text/character-set-conversion.h index 1e49357,0000000..1e49357 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/character-set-conversion.h +++ b/dali-toolkit/public-api/text/character-set-conversion.h diff --cc dali-toolkit/public-api/text/font-run.h index 3a1d455,0000000..3a1d455 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/font-run.h +++ b/dali-toolkit/public-api/text/font-run.h diff --cc dali-toolkit/public-api/text/layouts/layout-engine.cpp index 65cfc61,0000000..65cfc61 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/layouts/layout-engine.cpp +++ b/dali-toolkit/public-api/text/layouts/layout-engine.cpp diff --cc dali-toolkit/public-api/text/layouts/layout-engine.h index 55483de,0000000..55483de mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/layouts/layout-engine.h +++ b/dali-toolkit/public-api/text/layouts/layout-engine.h diff --cc dali-toolkit/public-api/text/logical-model.cpp index db30d05,0000000..db30d05 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/logical-model.cpp +++ b/dali-toolkit/public-api/text/logical-model.cpp diff --cc dali-toolkit/public-api/text/logical-model.h index f573014,0000000..f573014 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/logical-model.h +++ b/dali-toolkit/public-api/text/logical-model.h diff --cc dali-toolkit/public-api/text/multi-language-support.cpp index 1eb6805,0000000..1eb6805 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/multi-language-support.cpp +++ b/dali-toolkit/public-api/text/multi-language-support.cpp diff --cc dali-toolkit/public-api/text/multi-language-support.h index dbd2552,0000000..dbd2552 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/multi-language-support.h +++ b/dali-toolkit/public-api/text/multi-language-support.h diff --cc dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp index bde47cf,0000000..bde47cf mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp +++ b/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.cpp diff --cc dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h index 3133c6d,0000000..3133c6d mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h +++ b/dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h diff --cc dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp index f3a9004,0000000..f3a9004 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp +++ b/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.cpp diff --cc dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h index cc97d1b,0000000..cc97d1b mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h +++ b/dali-toolkit/public-api/text/rendering/shaders/text-basic-shader.h diff --cc dali-toolkit/public-api/text/rendering/text-renderer.cpp index fb7c7cb,0000000..fb7c7cb mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/text-renderer.cpp +++ b/dali-toolkit/public-api/text/rendering/text-renderer.cpp diff --cc dali-toolkit/public-api/text/rendering/text-renderer.h index d5001c1,0000000..d5001c1 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/rendering/text-renderer.h +++ b/dali-toolkit/public-api/text/rendering/text-renderer.h diff --cc dali-toolkit/public-api/text/script-run.h index c5dd698,0000000..c5dd698 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/script-run.h +++ b/dali-toolkit/public-api/text/script-run.h diff --cc dali-toolkit/public-api/text/script.cpp index 8860a14,0000000..8860a14 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/script.cpp +++ b/dali-toolkit/public-api/text/script.cpp diff --cc dali-toolkit/public-api/text/script.h index 7236778,0000000..7236778 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/script.h +++ b/dali-toolkit/public-api/text/script.h diff --cc dali-toolkit/public-api/text/segmentation.cpp index 88455d2,0000000..88455d2 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/segmentation.cpp +++ b/dali-toolkit/public-api/text/segmentation.cpp diff --cc dali-toolkit/public-api/text/segmentation.h index 85198c5,0000000..85198c5 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/segmentation.h +++ b/dali-toolkit/public-api/text/segmentation.h diff --cc dali-toolkit/public-api/text/text-controller.cpp index a5763d5,0000000..a5763d5 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-controller.cpp +++ b/dali-toolkit/public-api/text/text-controller.cpp diff --cc dali-toolkit/public-api/text/text-controller.h index 42ef0d6,0000000..42ef0d6 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-controller.h +++ b/dali-toolkit/public-api/text/text-controller.h diff --cc dali-toolkit/public-api/text/text-definitions.h index bf13293,0000000..bf13293 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-definitions.h +++ b/dali-toolkit/public-api/text/text-definitions.h diff --cc dali-toolkit/public-api/text/text-view-interface.cpp index 9bf1fb3,0000000..9bf1fb3 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-view-interface.cpp +++ b/dali-toolkit/public-api/text/text-view-interface.cpp diff --cc dali-toolkit/public-api/text/text-view-interface.h index a440209,0000000..a440209 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-view-interface.h +++ b/dali-toolkit/public-api/text/text-view-interface.h diff --cc dali-toolkit/public-api/text/text-view.cpp index 37dbbbb,0000000..37dbbbb mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-view.cpp +++ b/dali-toolkit/public-api/text/text-view.cpp diff --cc dali-toolkit/public-api/text/text-view.h index 81c63dd,0000000..81c63dd mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/text-view.h +++ b/dali-toolkit/public-api/text/text-view.h diff --cc dali-toolkit/public-api/text/visual-model.cpp index a8b0f79,0000000..a8b0f79 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/visual-model.cpp +++ b/dali-toolkit/public-api/text/visual-model.cpp diff --cc dali-toolkit/public-api/text/visual-model.h index 406eb21,0000000..406eb21 mode 100644,000000..100644 --- a/dali-toolkit/public-api/text/visual-model.h +++ b/dali-toolkit/public-api/text/visual-model.h