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
#include <dali.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/mesh-actor.h>
-#include <dali/devel-api/modeling/material.h>
+ #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
using namespace Dali;
using namespace Dali::Toolkit;
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)
--- /dev/null
- $(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 \
+ # 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_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_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_src_dir)/shader-effects/page-turn-book-spine-effect.h \
- $(devel_api_src_dir)/shader-effects/page-turn-effect.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/swirl-effect.h \
- $(devel_api_src_dir)/shader-effects/water-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_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
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
- #include <dali-toolkit/public-api/controls/bubble-effect/bubble-emitter.h>
+ #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
-#include <dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h>
namespace Dali
{
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/object/type-registry.h>
- #include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+//INTERNAL INCLUDES
++#include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
+
namespace Dali
{
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
- #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
- #include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
- #include <dali-toolkit/public-api/controls/shadow-view/shadow-view.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/internal/shader-effects/page-turn-effect-impl.h>
-#include <dali-toolkit/devel-api/shader-effects/page-turn-effect.h>
-#include <dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+ #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
namespace Dali
{
#include <dali/public-api/common/stage.h>
#include <dali/public-api/events/tap-gesture.h>
#include <dali/public-api/events/tap-gesture-detector.h>
+ #include <dali/public-api/events/touch-event.h>
#include <dali/public-api/events/pan-gesture.h>
#include <dali/public-api/events/pan-gesture-detector.h>
-#include <dali/devel-api/geometry/mesh.h>
-#include <dali/devel-api/geometry/mesh-data.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/math/rect.h>
#include <dali/public-api/math/vector2.h>
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;
}
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()
projects / platform / core / uifw / dali-toolkit.git / commitdiff