From: Francisco Santos Date: Mon, 8 Jun 2015 09:56:13 +0000 (+0100) Subject: Merge branch 'tizen' into devel/new_mesh X-Git-Tag: dali_1.0.47~13^2~20^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1c5674a11a51310ee689d6daf4e6b7d94dec607e Merge branch 'tizen' into devel/new_mesh Conflicts: automated-tests/src/dali-toolkit/CMakeLists.txt automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp build/tizen/dali-toolkit/Makefile.am dali-toolkit/dali-toolkit.h dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp dali-toolkit/devel-api/shader-effects/bendy-effect.cpp dali-toolkit/devel-api/shader-effects/blind-effect.cpp dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.cpp dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.cpp dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h dali-toolkit/devel-api/shader-effects/carousel-effect.cpp dali-toolkit/devel-api/shader-effects/displacement-effect.cpp dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp dali-toolkit/devel-api/shader-effects/image-region-effect.cpp dali-toolkit/devel-api/shader-effects/iris-effect.cpp dali-toolkit/devel-api/shader-effects/mask-effect.cpp dali-toolkit/devel-api/shader-effects/mirror-effect.cpp dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp dali-toolkit/devel-api/shader-effects/overlay-effect.cpp dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp dali-toolkit/devel-api/shader-effects/page-turn-effect.h dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp dali-toolkit/devel-api/shader-effects/ripple-effect.cpp dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp dali-toolkit/devel-api/shader-effects/shear-effect.cpp dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp dali-toolkit/devel-api/shader-effects/spot-effect.cpp dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp dali-toolkit/devel-api/shader-effects/swirl-effect.cpp dali-toolkit/devel-api/shader-effects/water-effect.cpp dali-toolkit/devel-api/shader-effects/water-effect.h dali-toolkit/internal/controls/bubble-effect/bubble-actor.h dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h dali-toolkit/internal/controls/buttons/check-box-button-impl.h dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp dali-toolkit/internal/shader-effects/page-turn-effect-impl.h dali-toolkit/internal/shader-effects/water-effect-impl.cpp dali-toolkit/internal/shader-effects/water-effect-impl.h dali-toolkit/public-api/controls/control-impl.cpp dali-toolkit/public-api/file.list dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h docs/content/programming-guide/shader-intro.h Change-Id: I677eaa3e6a0558c360fc6b379a73fac18d0eb008 --- 1c5674a11a51310ee689d6daf4e6b7d94dec607e diff --cc automated-tests/src/dali-toolkit/CMakeLists.txt index 20932d6,523b97a..9217cd0 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@@ -25,12 -32,19 +25,13 @@@ SET(TC_SOURCE utc-Dali-TableView.cpp utc-Dali-TextField.cpp utc-Dali-TextLabel.cpp + utc-Dali-TextSelectionPopup.cpp utc-Dali-ToolBar.cpp - utc-Dali-WaterEffect.cpp utc-Dali-Button.cpp utc-Dali-Control.cpp utc-Dali-ControlImpl.cpp utc-Dali-DefaultControls.cpp - utc-Dali-FocusManager.cpp - utc-Dali-DissolveEffect.cpp + utc-Dali-AccessibilityFocusManager.cpp - utc-Dali-IrisEffect.cpp utc-Dali-ItemLayout.cpp utc-Dali-ItemView.cpp utc-Dali-KeyboardFocusManager.cpp diff --cc automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index 33a0c2c,e25d8d5..db8a9df --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@@ -24,6 -24,9 +24,7 @@@ #include #include -#include -#include + #include using namespace Dali; using namespace Dali::Toolkit; diff --cc build/tizen/dali-toolkit/Makefile.am index 99016ae,b1d8989..aa58132 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@@ -78,78 -81,75 +81,73 @@@ libdali_toolkit_la_LIBADD = 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 - publicapitextcontrolsdir = $(publicapidir)/controls/text-controls - publicapitoolbardir = $(publicapicontrolsdir)/tool-bar - publicapiviewdir = $(publicapicontrolsdir)/view - publicapibuilderdir = $(publicapidir)/builder - publicapifocusmanagerdir = $(publicapidir)/focus-manager - publicapishadereffectsdir = $(publicapidir)/shader-effects - publicapibubbleeffectdir = $(publicapidir)/shader-effects/bubble-effect - publicapistylingdir = $(publicapidir)/styling - publicapitransitioneffectsdir = $(publicapidir)/transition-effects - publicapiscriptingdir = $(publicapidir)/scripting - publicapirenderingbackenddir = $(publicapidir)/text - - 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) + # devel api + develapidir = $(topleveldir)/devel-api + develapibuilderdir = $(develapidir)/builder + develapicontrolsdir = $(develapidir)/controls + develapibloomviewdir = $(develapicontrolsdir)/bloom-view + develapibubbleemitterdir = $(develapicontrolsdir)/bubble-effect + develapieffectsviewdir = $(develapicontrolsdir)/effects-view + develapimagnifierdir = $(develapicontrolsdir)/magnifier + develapipopupdir = $(develapicontrolsdir)/popup + develapipageturnviewdir = $(develapicontrolsdir)/page-turn-view + develapisliderdir = $(develapicontrolsdir)/slider + develapishadowviewdir = $(develapicontrolsdir)/shadow-view + develapisuperblurviewdir = $(develapicontrolsdir)/super-blur-view + develapifocusmanagerdir = $(develapidir)/focus-manager + develapiscriptingdir = $(develapidir)/scripting -develapibubbleeffectdir = $(develapidir)/shader-effects/bubble-effect + develapishadereffectsdir = $(develapidir)/shader-effects + develapitransitioneffectsdir = $(develapidir)/transition-effects + develapistylingdir = $(develapidir)/styling + develapitoolbardir = $(develapicontrolsdir)/tool-bar + + # devel headers + develapibloomview_HEADERS = $(devel_api_bloom_view_header_files) + develapibubbleemitter_HEADERS = $(devel_api_bubble_emitter_header_files) -develapibubbleeffect_HEADERS = $(devel_api_bubble_effect_header_files) + develapibuilder_HEADERS = $(devel_api_builder_header_files) + develapieffectsview_HEADERS = $(devel_api_effects_view_header_files) + develapifocusmanager_HEADERS = $(devel_api_focus_manager_header_files) + develapimagnifier_HEADERS = $(devel_api_magnifier_header_files) + develapipageturnview_HEADERS = $(devel_api_page_turn_view_header_files) + develapipopup_HEADERS = $(devel_api_popup_header_files) + develapiscripting_HEADERS = $(devel_api_scripting_header_files) + develapishadowview_HEADERS = $(devel_api_shadow_view_header_files) + develapishadereffects_HEADERS = $(devel_api_shader_effects_header_files) + develapislider_HEADERS = $(devel_api_slider_header_files) + develapistyling_HEADERS = $(devel_api_styling_header_files) + develapisuperblurview_HEADERS = $(devel_api_super_blur_view_header_files) + develapitoolbar_HEADERS = $(devel_api_tool_bar_header_files) + develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files) + + # public api source + publicapidir = $(topleveldir)/public-api + publicapicontrolsdir = $(publicapidir)/controls + publicapialignmentdir = $(publicapicontrolsdir)/alignment + publicapibuttonsdir = $(publicapicontrolsdir)/buttons + publicapidefaultcontrolsdir = $(publicapicontrolsdir)/default-controls + publicapigaussianblurviewdir = $(publicapicontrolsdir)/gaussian-blur-view + publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar + publicapiscrollabledir = $(publicapicontrolsdir)/scrollable + publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view + publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view + publicapitableviewdir = $(publicapicontrolsdir)/table-view + publicapitextcontrolsdir = $(publicapicontrolsdir)/text-controls + publicapifocusmanagerdir = $(publicapidir)/focus-manager + publicapirenderingbackenddir = $(publicapidir)/text + + # public api headers + publicapi_HEADERS = $(public_api_header_files) + publicapicontrols_HEADERS = $(public_api_controls_header_files) + publicapialignment_HEADERS = $(public_api_alignment_header_files) + publicapibuttons_HEADERS = $(public_api_buttons_header_files) + publicapidefaultcontrols_HEADERS = $(public_api_default_controls_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) - publicapitextcontrols_HEADERS = $(public_api_text_controls_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) - publicapishadereffects_HEADERS = $(public_api_shader_effects_header_files) - publicapistyling_HEADERS = $(public_api_styling_header_files) - publicapitransitioneffects_HEADERS = $(public_api_transition_effects_header_files) - publicapiscripting_HEADERS = $(public_api_scripting_header_files) + publicapiitemview_HEADERS = $(public_api_item_view_header_files) + publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files) + publicapiscrollable_HEADERS = $(public_api_scrollable_header_files) + publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files) + publicapitableview_HEADERS = $(public_api_table_view_header_files) + publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files) + publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files) publicapirenderingbackend_HEADERS = $(public_api_rendering_backend_header_files) diff --cc dali-toolkit/devel-api/file.list index 0000000,ae50ba3..f10a341 mode 000000,100755..100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@@ -1,0 -1,151 +1,114 @@@ + # Add local source files here + + devel_api_src_files = \ + $(devel_api_src_dir)/builder/builder.cpp \ + $(devel_api_src_dir)/builder/json-parser.cpp \ + $(devel_api_src_dir)/builder/tree-node.cpp \ + $(devel_api_src_dir)/controls/bloom-view/bloom-view.cpp \ + $(devel_api_src_dir)/controls/bubble-effect/bubble-emitter.cpp \ + $(devel_api_src_dir)/controls/effects-view/effects-view.cpp \ + $(devel_api_src_dir)/controls/magnifier/magnifier.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-factory.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.cpp \ + $(devel_api_src_dir)/controls/popup/popup.cpp \ + $(devel_api_src_dir)/controls/shadow-view/shadow-view.cpp \ + $(devel_api_src_dir)/controls/slider/slider.cpp \ + $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \ + $(devel_api_src_dir)/controls/text-controls/text-selection-popup.cpp \ + $(devel_api_src_dir)/controls/tool-bar/tool-bar.cpp \ + $(devel_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \ + $(devel_api_src_dir)/styling/style-manager.cpp \ + $(devel_api_src_dir)/scripting/script.cpp \ - $(devel_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \ - $(devel_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \ - $(devel_api_src_dir)/shader-effects/alpha-discard-effect.cpp \ - $(devel_api_src_dir)/shader-effects/bendy-effect.cpp \ - $(devel_api_src_dir)/shader-effects/blind-effect.cpp \ - $(devel_api_src_dir)/shader-effects/bouncing-effect.cpp \ - $(devel_api_src_dir)/shader-effects/carousel-effect.cpp \ - $(devel_api_src_dir)/shader-effects/displacement-effect.cpp \ - $(devel_api_src_dir)/shader-effects/dissolve-effect.cpp \ - $(devel_api_src_dir)/shader-effects/dissolve-local-effect.cpp \ - $(devel_api_src_dir)/shader-effects/distance-field-effect.cpp \ - $(devel_api_src_dir)/shader-effects/image-region-effect.cpp \ - $(devel_api_src_dir)/shader-effects/iris-effect.cpp \ - $(devel_api_src_dir)/shader-effects/mask-effect.cpp \ - $(devel_api_src_dir)/shader-effects/mirror-effect.cpp \ - $(devel_api_src_dir)/shader-effects/motion-blur-effect.cpp \ - $(devel_api_src_dir)/shader-effects/motion-stretch-effect.cpp \ - $(devel_api_src_dir)/shader-effects/nine-patch-mask-effect.cpp \ - $(devel_api_src_dir)/shader-effects/overlay-effect.cpp \ - $(devel_api_src_dir)/shader-effects/page-turn-book-spine-effect.cpp \ - $(devel_api_src_dir)/shader-effects/page-turn-effect.cpp \ - $(devel_api_src_dir)/shader-effects/quadratic-bezier.cpp \ - $(devel_api_src_dir)/shader-effects/ripple-effect.cpp \ - $(devel_api_src_dir)/shader-effects/ripple2d-effect.cpp \ - $(devel_api_src_dir)/shader-effects/shear-effect.cpp \ - $(devel_api_src_dir)/shader-effects/soft-button-effect.cpp \ - $(devel_api_src_dir)/shader-effects/spot-effect.cpp \ - $(devel_api_src_dir)/shader-effects/square-dissolve-effect.cpp \ - $(devel_api_src_dir)/shader-effects/swirl-effect.cpp \ - $(devel_api_src_dir)/shader-effects/water-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \ + $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp + + # Add devel header files here + + devel_api_bloom_view_header_files = \ + $(devel_api_src_dir)/controls/bloom-view/bloom-view.h + -devel_api_bubble_effect_header_files = \ - $(devel_api_src_dir)/shader-effects/bubble-effect/bubble-effect.h \ - $(devel_api_src_dir)/shader-effects/bubble-effect/color-adjuster.h - + devel_api_bubble_emitter_header_files = \ + $(devel_api_src_dir)/controls/bubble-effect/bubble-emitter.h + + devel_api_builder_header_files = \ + $(devel_api_src_dir)/builder/builder.h \ + $(devel_api_src_dir)/builder/json-parser.h \ + $(devel_api_src_dir)/builder/tree-node.h + + devel_api_effects_view_header_files = \ + $(devel_api_src_dir)/controls/effects-view/effects-view.h + + devel_api_magnifier_header_files = \ + $(devel_api_src_dir)/controls/magnifier/magnifier.h + + devel_api_page_turn_view_header_files = \ + $(devel_api_src_dir)/controls/page-turn-view/page-factory.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.h \ + $(devel_api_src_dir)/controls/page-turn-view/page-turn-view.h + + devel_api_popup_header_files = \ + $(devel_api_src_dir)/controls/popup/popup.h + + devel_api_shadow_view_header_files = \ + $(devel_api_src_dir)/controls/shadow-view/shadow-view.h + + devel_api_slider_header_files = \ + $(devel_api_src_dir)/controls/slider/slider.h + + devel_api_focus_manager_header_files = \ + $(devel_api_src_dir)/focus-manager/keyinput-focus-manager.h + + devel_api_styling_header_files = \ + $(devel_api_src_dir)/styling/style-manager.h + + devel_api_scripting_header_files = \ + $(devel_api_src_dir)/scripting/script.h \ + $(devel_api_src_dir)/scripting/script-plugin.h + + devel_api_shader_effects_header_files = \ + $(devel_api_src_dir)/shader-effects/alpha-discard-effect.h \ + $(devel_api_src_dir)/shader-effects/bendy-effect.h \ + $(devel_api_src_dir)/shader-effects/blind-effect.h \ + $(devel_api_src_dir)/shader-effects/bouncing-effect.h \ + $(devel_api_src_dir)/shader-effects/carousel-effect.h \ + $(devel_api_src_dir)/shader-effects/displacement-effect.h \ + $(devel_api_src_dir)/shader-effects/dissolve-effect.h \ + $(devel_api_src_dir)/shader-effects/dissolve-local-effect.h \ + $(devel_api_src_dir)/shader-effects/distance-field-effect.h \ + $(devel_api_src_dir)/shader-effects/image-region-effect.h \ + $(devel_api_src_dir)/shader-effects/iris-effect.h \ + $(devel_api_src_dir)/shader-effects/mask-effect.h \ + $(devel_api_src_dir)/shader-effects/mirror-effect.h \ + $(devel_api_src_dir)/shader-effects/motion-blur-effect.h \ + $(devel_api_src_dir)/shader-effects/motion-stretch-effect.h \ + $(devel_api_src_dir)/shader-effects/nine-patch-mask-effect.h \ + $(devel_api_src_dir)/shader-effects/overlay-effect.h \ - $(devel_api_src_dir)/shader-effects/page-turn-book-spine-effect.h \ - $(devel_api_src_dir)/shader-effects/page-turn-effect.h \ + $(devel_api_src_dir)/shader-effects/quadratic-bezier.h \ + $(devel_api_src_dir)/shader-effects/ripple-effect.h \ + $(devel_api_src_dir)/shader-effects/ripple2d-effect.h \ + $(devel_api_src_dir)/shader-effects/shear-effect.h \ + $(devel_api_src_dir)/shader-effects/soft-button-effect.h \ + $(devel_api_src_dir)/shader-effects/spot-effect.h \ + $(devel_api_src_dir)/shader-effects/square-dissolve-effect.h \ - $(devel_api_src_dir)/shader-effects/swirl-effect.h \ - $(devel_api_src_dir)/shader-effects/water-effect.h ++ $(devel_api_src_dir)/shader-effects/swirl-effect.h + + devel_api_super_blur_view_header_files = \ + $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h + + devel_api_text_selection_popup_header_files = \ + $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h + + devel_api_tool_bar_header_files = \ + $(devel_api_src_dir)/controls/tool-bar/tool-bar.h + + devel_api_transition_effects_header_files = \ + $(devel_api_src_dir)/transition-effects/cube-transition-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.h \ + $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.h + diff --cc dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h index 135a634,8623880..c016920 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h @@@ -30,7 -29,8 +30,7 @@@ // INTERNAL INCLUDES #include - #include + #include -#include namespace Dali { diff --cc dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index bb76721,88e5364..f5c908d --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp @@@ -22,9 -22,6 +22,9 @@@ #include #include +//INTERNAL INCLUDES - #include ++#include + namespace Dali { diff --cc dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h index 007fb2f,c09250f..9ae696b --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h @@@ -27,9 -27,12 +27,9 @@@ // INTERNAL INCLUDES #include - #include - #include - #include + #include -#include -#include -#include + #include + #include namespace Dali { diff --cc dali-toolkit/internal/text/decorator/text-decorator.cpp index 34b3726,e92866b..245e581 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@@ -29,8 -30,11 +29,9 @@@ #include #include #include + #include #include #include -#include -#include #include #include #include diff --cc dali-toolkit/public-api/controls/control-impl.cpp index 0e87de0,1cb02bf..c720ee1 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@@ -560,11 -531,13 +531,14 @@@ void Control::SetBackgroundColor( cons SetupBackgroundActorConstrained( meshActor, Actor::Property::SCALE, color ); - // Set the background actor before adding so that we do not inform deriving classes background.actor = meshActor; - Self().Add( meshActor ); + // Set the flag to avoid notifying children + mImpl->mAddRemoveBackgroundChild = true; + // use insert to guarantee its the first child (so that OVERLAY mode works) + Self().Insert( 0, meshActor ); + mImpl->mAddRemoveBackgroundChild = false; } + */ background.color = color; } @@@ -589,14 -564,15 +565,17 @@@ void Control::SetBackgroundImage( Imag background.actor.Reset(); } + /* ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, Actor::Property::SIZE, background.color ); + SetupBackgroundActor( imageActor, background.color ); // Set the background actor before adding so that we do not inform derived classes background.actor = imageActor; - Self().Add( imageActor ); + mImpl->mAddRemoveBackgroundChild = true; + // use insert to guarantee its the first child (so that OVERLAY mode works) + Self().Insert( 0, imageActor ); + mImpl->mAddRemoveBackgroundChild = false; + */ } void Control::ClearBackground()