From: Paul Wisbey Date: Fri, 13 Mar 2015 11:01:52 +0000 (+0000) Subject: Merge remote-tracking branch 'origin/tizen' into new_text X-Git-Tag: dali_1.0.38~11^2~58 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3b1fb566901d21b8303d9be3308e3920f5182e6d;hp=21c8df56ea5b766c923c9c1d6bb1152c8c640616 Merge remote-tracking branch 'origin/tizen' into new_text Conflicts: dali-toolkit/public-api/controls/text-input/text-input.h dali-toolkit/public-api/controls/text-view/text-view.h Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0 --- diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp index 40428e3..0efd85b 100644 --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -43,12 +43,12 @@ using namespace Dali; // Signal Actions // -// Action on child actor. The child is found by alias so can be 'previous' etc. +// Action on child actor. The child is found by name struct ChildActorAction { std::string actorName; std::string actionName; - std::string childAlias; + std::string childName; PropertyValueContainer parameters; void operator()(void) @@ -57,7 +57,7 @@ struct ChildActorAction if(actor) { - Actor child_actor = actor.FindChildByAlias(childAlias); + Actor child_actor = actor.FindChildByName(childName); if(child_actor) { @@ -65,7 +65,7 @@ struct ChildActorAction } else { - DALI_SCRIPT_WARNING("Could not find child by alias '%s'\n", childAlias.c_str()); + DALI_SCRIPT_WARNING("Could not find child by name '%s'\n", childName.c_str()); } } }; @@ -239,7 +239,7 @@ boost::function GetAction(const TreeNode &root, const TreeNode &chi { ChildActorAction action; action.actorName = *actorName; - action.childAlias = *childActorName; + action.childName = *childActorName; action.actionName = *actionName; GetParameters(child, action.parameters); callback = action; diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index a3d0ca2..19e9fc6 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -75,16 +75,16 @@ public: { enum { - DISABLED = PROPERTY_START_INDEX, ///< name "disabled", @see SetDisabled(), type BOOLEAN - AUTO_REPEATING, ///< name "auto-repeating", @see SetAutoRepeating(), type BOOLEAN - INITIAL_AUTO_REPEATING_DELAY, ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type FLOAT - NEXT_AUTO_REPEATING_DELAY, ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type FLOAT - TOGGLABLE, ///< name "togglable", @see SetTogglableButton(), type BOOLEAN - SELECTED, ///< name "selected", @see SetSelected(), type BOOLEAN - NORMAL_STATE_ACTOR, ///< name "normal-state-actor", @see SetButtonImage(), type MAP - SELECTED_STATE_ACTOR, ///< name "selected-state-actor", @see SetSelectedImage(), type MAP - DISABLED_STATE_ACTOR, ///< name "disabled-state-actor", @see SetDisabledImage(), type MAP - LABEL_ACTOR, ///< name "label-actor", @see SetLabel(), type MAP + DISABLED = PROPERTY_START_INDEX, ///< name "disabled", @see SetDisabled(), type bool + AUTO_REPEATING, ///< name "auto-repeating", @see SetAutoRepeating(), type bool + INITIAL_AUTO_REPEATING_DELAY, ///< name "initial-auto-repeating-delay", @see SetInitialAutoRepeatingDelay(), type float + NEXT_AUTO_REPEATING_DELAY, ///< name "next-auto-repeating-delay", @see SetNextAutoRepeatingDelay(), type float + TOGGLABLE, ///< name "togglable", @see SetTogglableButton(), type bool + SELECTED, ///< name "selected", @see SetSelected(), type bool + NORMAL_STATE_ACTOR, ///< name "normal-state-actor", @see SetButtonImage(), type Map + SELECTED_STATE_ACTOR, ///< name "selected-state-actor", @see SetSelectedImage(), type Map + DISABLED_STATE_ACTOR, ///< name "disabled-state-actor", @see SetDisabledImage(), type Map + LABEL_ACTOR, ///< name "label-actor", @see SetLabel(), type Map }; }; diff --git a/dali-toolkit/public-api/controls/cluster/cluster.h b/dali-toolkit/public-api/controls/cluster/cluster.h index aff0afb..d417e0f 100644 --- a/dali-toolkit/public-api/controls/cluster/cluster.h +++ b/dali-toolkit/public-api/controls/cluster/cluster.h @@ -54,7 +54,7 @@ public: // Custom properties - static const std::string CLUSTER_ACTOR_DEPTH; ///< Property, name "cluster-actor-depth", type FLOAT + static const std::string CLUSTER_ACTOR_DEPTH; ///< Property, name "cluster-actor-depth", type float public: diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 16a009b..b79badd 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -1308,11 +1308,6 @@ bool Control::OnMouseWheelEvent(const MouseWheelEvent& event) return false; // Do not consume } -Actor Control::GetChildByAlias(const std::string& actorAlias) -{ - return Actor(); -} - void Control::OnStageConnection() { RelayoutRequest(); diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 72c0535..a441b07 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -646,11 +646,6 @@ private: */ virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); - /** - * @copydoc Dali::CustomActorImpl::GetChildByAlias(const std::string& actorAlias) - */ - virtual Actor GetChildByAlias(const std::string& actorAlias); - // From CustomActorImpl, derived classes should NOT override these. /** diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 4ff673e..af840cd 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -82,13 +82,13 @@ public: { enum { - BACKGROUND_COLOR = PROPERTY_START_INDEX, ///< name "background-color", @see SetBackgroundColor, type VECTOR4 - BACKGROUND, ///< name "background", @see SetBackground, type MAP - WIDTH_POLICY, ///< name "width-policy", @see SetSizePolicy, type STRING - HEIGHT_POLICY, ///< name "height-policy", @see SetSizePolicy, type STRING - MINIMUM_SIZE, ///< name "minimum-size", @see SetMinimumSize, type VECTOR3 - MAXIMUM_SIZE, ///< name "maximum-size", @see SetMaximumSize, type VECTOR3 - KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type BOOLEAN + BACKGROUND_COLOR = PROPERTY_START_INDEX, ///< name "background-color", @see SetBackgroundColor, type Vector4 + BACKGROUND, ///< name "background", @see SetBackground, type Map + WIDTH_POLICY, ///< name "width-policy", @see SetSizePolicy, type std::string + HEIGHT_POLICY, ///< name "height-policy", @see SetSizePolicy, type std::string + MINIMUM_SIZE, ///< name "minimum-size", @see SetMinimumSize, type Vector3 + MAXIMUM_SIZE, ///< name "maximum-size", @see SetMaximumSize, type Vector3 + KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type bool }; }; diff --git a/dali-toolkit/public-api/controls/image-view/masked-image-view.h b/dali-toolkit/public-api/controls/image-view/masked-image-view.h index b474e76..0c604ec 100644 --- a/dali-toolkit/public-api/controls/image-view/masked-image-view.h +++ b/dali-toolkit/public-api/controls/image-view/masked-image-view.h @@ -59,11 +59,11 @@ public: */ enum CustomProperty { - BACKGROUND_COLOR, ///< Name "background-color", type VECTOR4 - SOURCE_SIZE, ///< Name "source-size", type VECTOR2 - SOURCE_OFFSET, ///< Name "source-offset", type VECTOR2 - MASK_SIZE, ///< Name "mask-size", type VECTOR2 - MASK_OFFSET, ///< Name "mask-offset", type VECTOR2 + BACKGROUND_COLOR, ///< Name "background-color", type Vector4 + SOURCE_SIZE, ///< Name "source-size", type Vector2 + SOURCE_OFFSET, ///< Name "source-offset", type Vector2 + MASK_SIZE, ///< Name "mask-size", type Vector2 + MASK_OFFSET, ///< Name "mask-offset", type Vector2 CUSTOM_PROPERTY_COUNT }; diff --git a/dali-toolkit/public-api/controls/magnifier/magnifier.h b/dali-toolkit/public-api/controls/magnifier/magnifier.h index 4538f81..ff6cee0 100644 --- a/dali-toolkit/public-api/controls/magnifier/magnifier.h +++ b/dali-toolkit/public-api/controls/magnifier/magnifier.h @@ -47,7 +47,7 @@ public: // Custom properties - static const std::string SOURCE_POSITION_PROPERTY_NAME; ///< Property, name "source-position", type VECTOR3 + static const std::string SOURCE_POSITION_PROPERTY_NAME; ///< Property, name "source-position", type Vector3 public: diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index 0e84d9e..70fcb9d 100755 --- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -69,10 +69,10 @@ public: { enum { - INDICATOR_HEIGHT_POLICY = PROPERTY_START_INDEX, ///< name "indicator-height-policy", @see SetIndicatorHeightPolicy(), type STRING - INDICATOR_FIXED_HEIGHT, ///< name "indicator-fixed-height", @see SetIndicatorFixedHeight(), type FLOAT - INDICATOR_SHOW_DURATION, ///< name "indicator-show-duration", @see SetIndicatorShowDuration(), type FLOAT - INDICATOR_HIDE_DURATION, ///< name "indicator-hide-duration", @see SetIndicatorHideDuration(), type FLOAT + INDICATOR_HEIGHT_POLICY = PROPERTY_START_INDEX, ///< name "indicator-height-policy", @see SetIndicatorHeightPolicy(), type std::string + INDICATOR_FIXED_HEIGHT, ///< name "indicator-fixed-height", @see SetIndicatorFixedHeight(), type float + INDICATOR_SHOW_DURATION, ///< name "indicator-show-duration", @see SetIndicatorShowDuration(), type float + INDICATOR_HIDE_DURATION, ///< name "indicator-hide-duration", @see SetIndicatorHideDuration(), type float }; }; diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 818e4b4..6cf6331 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -411,17 +411,17 @@ public: // Custom properties - static const std::string SCROLL_TIME_PROPERTY_NAME; ///< Property, name "scroll-time", type FLOAT - static const std::string SCROLL_POSITION_PROPERTY_NAME; ///< Property, name "scroll-position", type VECTOR3 - static const std::string SCROLL_PRE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-pre-position", type VECTOR3 - static const std::string SCROLL_OVERSHOOT_X_PROPERTY_NAME; ///< Property, name "scroll-overshoot-x", type float - static const std::string SCROLL_OVERSHOOT_Y_PROPERTY_NAME; ///< Property, name "scroll-overshoot-y", type float - static const std::string SCROLL_FINAL_PROPERTY_NAME; ///< Property, name "scroll-final", type VECTOR3 - static const std::string SCROLL_WRAP_PROPERTY_NAME; ///< Property, name "scroll-wrap", type BOOLEAN - static const std::string SCROLL_PANNING_PROPERTY_NAME; ///< Property, name "scroll-panning", type BOOLEAN - static const std::string SCROLL_SCROLLING_PROPERTY_NAME; ///< Property, name "scroll-scrolling", type BOOLEAN - static const std::string SCROLL_POSITION_DELTA_PROPERTY_NAME; ///< Property, name "scroll-position-delta" type VECTOR3 - static const std::string SCROLL_START_PAGE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-start-page-position" type VECTOR3 + static const std::string SCROLL_TIME_PROPERTY_NAME; ///< Property, name "scroll-time", type float + static const std::string SCROLL_POSITION_PROPERTY_NAME; ///< Property, name "scroll-position", type Vector3 + static const std::string SCROLL_PRE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-pre-position", type Vector3 + static const std::string SCROLL_OVERSHOOT_X_PROPERTY_NAME; ///< Property, name "scroll-overshoot-x", type float + static const std::string SCROLL_OVERSHOOT_Y_PROPERTY_NAME; ///< Property, name "scroll-overshoot-y", type float + static const std::string SCROLL_FINAL_PROPERTY_NAME; ///< Property, name "scroll-final", type Vector3 + static const std::string SCROLL_WRAP_PROPERTY_NAME; ///< Property, name "scroll-wrap", type bool + static const std::string SCROLL_PANNING_PROPERTY_NAME; ///< Property, name "scroll-panning", type bool + static const std::string SCROLL_SCROLLING_PROPERTY_NAME; ///< Property, name "scroll-scrolling", type bool + static const std::string SCROLL_POSITION_DELTA_PROPERTY_NAME; ///< Property, name "scroll-position-delta" type Vector3 + static const std::string SCROLL_START_PAGE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-start-page-position" type Vector3 // Default settings diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h index f28a9da..0b315f3 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -61,10 +61,10 @@ public: // Custom properties - static const std::string SCROLL_RELATIVE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-relative-position", type VECTOR3 - static const std::string SCROLL_POSITION_MIN_PROPERTY_NAME; ///< Property, name "scroll-position-min", type VECTOR3 - static const std::string SCROLL_POSITION_MAX_PROPERTY_NAME; ///< Property, name "scroll-position-max", type VECTOR3 - static const std::string SCROLL_DIRECTION_PROPERTY_NAME; ///< Property, name "scroll-direction", type VECTOR2 + static const std::string SCROLL_RELATIVE_POSITION_PROPERTY_NAME; ///< Property, name "scroll-relative-position", type Vector3 + static const std::string SCROLL_POSITION_MIN_PROPERTY_NAME; ///< Property, name "scroll-position-min", type Vector3 + static const std::string SCROLL_POSITION_MAX_PROPERTY_NAME; ///< Property, name "scroll-position-max", type Vector3 + static const std::string SCROLL_DIRECTION_PROPERTY_NAME; ///< Property, name "scroll-direction", type Vector2 /** * @brief The start and end property ranges for this control. @@ -82,8 +82,8 @@ public: { enum { - OVERSHOOT_EFFECT_COLOR = PROPERTY_START_INDEX, ///< Property, name "overshoot-effect-color", @see SetOvershootEffectColor(), type VECTOR4 - OVERSHOOT_ANIMATION_SPEED, ///< Property, name "overshoot-animation-speed", @see SetOvershootAnimationSpeed(), type FLOAT + OVERSHOOT_EFFECT_COLOR = PROPERTY_START_INDEX, ///< Property, name "overshoot-effect-color", @see SetOvershootEffectColor(), type Vector4 + OVERSHOOT_ANIMATION_SPEED, ///< Property, name "overshoot-animation-speed", @see SetOvershootAnimationSpeed(), type float }; }; diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index d3f7740..7b9ae6b 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -61,26 +61,26 @@ public: { enum { - LOWER_BOUND = PROPERTY_START_INDEX, ///< Property, name "lower-bound", type FLOAT - UPPER_BOUND, ///< Property, name "upper-bound", type FLOAT - VALUE, ///< Property, name "value", type FLOAT - HIT_REGION, ///< Property, name "hit-region", type VECTOR2 - BACKING_REGION, ///< Property, name "backing-region", type VECTOR2 - HANDLE_REGION, ///< Property, name "handle-region", type VECTOR2 - BACKING_IMAGE_NAME, ///< Property, name "backing-image-name", type STRING - HANDLE_IMAGE_NAME, ///< Property, name "handle-image-name", type STRING - PROGRESS_IMAGE_NAME, ///< Property, name "progress-image-name", type STRING - POPUP_IMAGE_NAME, ///< Property, name "popup-image-name", type STRING - POPUP_ARROW_IMAGE_NAME, ///< Property, name "popup-arrow-image-name", type STRING - DISABLE_COLOR, ///< Property, name "disable-color", type VECTOR4 - POPUP_TEXT_COLOR, ///< Property, name "popup-text-color", type VECTOR4 - VALUE_PRECISION, ///< Property, name "value-precision", type INTEGER - SHOW_POPUP, ///< Property, name "show-popup", type BOOLEAN - SHOW_VALUE, ///< Property, name "show-value", type BOOLEAN - ENABLED, ///< Property, name "enabled", type BOOLEAN - MARKS, ///< Property, name "marks", type Property::Array - SNAP_TO_MARKS, ///< Property, name "snap-to-marks", type BOOLEAN - MARK_TOLERANCE, ///< Property, name "mark-tolerance", type FLOAT + LOWER_BOUND = PROPERTY_START_INDEX, ///< Property, name "lower-bound", type float + UPPER_BOUND, ///< Property, name "upper-bound", type float + VALUE, ///< Property, name "value", type float + HIT_REGION, ///< Property, name "hit-region", type Vector2 + BACKING_REGION, ///< Property, name "backing-region", type Vector2 + HANDLE_REGION, ///< Property, name "handle-region", type Vector2 + BACKING_IMAGE_NAME, ///< Property, name "backing-image-name", type std::string + HANDLE_IMAGE_NAME, ///< Property, name "handle-image-name", type std::string + PROGRESS_IMAGE_NAME, ///< Property, name "progress-image-name", type std::string + POPUP_IMAGE_NAME, ///< Property, name "popup-image-name", type std::string + POPUP_ARROW_IMAGE_NAME, ///< Property, name "popup-arrow-image-name", type std::string + DISABLE_COLOR, ///< Property, name "disable-color", type Vector4 + POPUP_TEXT_COLOR, ///< Property, name "popup-text-color", type Vector4 + VALUE_PRECISION, ///< Property, name "value-precision", type int + SHOW_POPUP, ///< Property, name "show-popup", type bool + SHOW_VALUE, ///< Property, name "show-value", type bool + ENABLED, ///< Property, name "enabled", type bool + MARKS, ///< Property, name "marks", type Property::Array + SNAP_TO_MARKS, ///< Property, name "snap-to-marks", type bool + MARK_TOLERANCE, ///< Property, name "mark-tolerance", type float }; }; diff --git a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h index 6bc6e42..c02c09c 100644 --- a/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h +++ b/dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h @@ -72,7 +72,7 @@ public: { enum { - IMAGE = PROPERTY_START_INDEX, ///< name "image", @see SetImage, type MAP + IMAGE = PROPERTY_START_INDEX, ///< name "image", @see SetImage, type Map }; }; diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h index 549a145..104a050 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -81,18 +81,18 @@ public: { enum { - ROWS = PROPERTY_START_INDEX, ///< name "rows", type UNSIGNED_INTEGER - COLUMNS, ///< name "columns", type UNSIGNED_INTEGER - CELL_PADDING, ///< name "cell-padding", type VECTOR2 - LAYOUT_ROWS, ///< name "layout-rows", type MAP - LAYOUT_COLUMNS, ///< name "layout-columns", type MAP + ROWS = PROPERTY_START_INDEX, ///< name "rows", type unsigned int + COLUMNS, ///< name "columns", type unsigned int + CELL_PADDING, ///< name "cell-padding", type Vector2 + LAYOUT_ROWS, ///< name "layout-rows", type Map + LAYOUT_COLUMNS, ///< name "layout-columns", type Map }; }; // Custom properties for where to put the actor, these properties should be registered to the child which would be added to the table - static const std::string CELL_INDICES_PROPERTY_NAME; ///< Property, name "cell-indices", type VECTOR2 - static const std::string ROW_SPAN_PROPERTY_NAME; ///< Property, name "row-span", type FLOAT (Currently builder unable to differentiate integer and float from Json string) - static const std::string COLUMN_SPAN_PROPERTY_NAME; ///< Property, name "column-span", type FLOAT (Currently builder unable to differentiate integer and float from Json string) + static const std::string CELL_INDICES_PROPERTY_NAME; ///< Property, name "cell-indices", type Vector2 + static const std::string ROW_SPAN_PROPERTY_NAME; ///< Property, name "row-span", type float (Currently builder is unable to differentiate integer and float from Json string) + static const std::string COLUMN_SPAN_PROPERTY_NAME; ///< Property, name "column-span", type float (Currently builder is unable to differentiate integer and float from Json string) /** * @brief Describes how the size of a row / column been set diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index ba2e1d8..78fc9df 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 0; -const unsigned int TOOLKIT_MICRO_VERSION = 32; +const unsigned int TOOLKIT_MICRO_VERSION = 33; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 912c7a9..921e2dc 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: The OpenGLES Canvas Core Library Toolkit -Version: 1.0.32 +Version: 1.0.33 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/plugins/dali-script-v8/src/actors/actor-api.cpp b/plugins/dali-script-v8/src/actors/actor-api.cpp index ebc1fa7..89a3a67 100644 --- a/plugins/dali-script-v8/src/actors/actor-api.cpp +++ b/plugins/dali-script-v8/src/actors/actor-api.cpp @@ -335,39 +335,6 @@ void ActorApi::FindChildByName( const v8::FunctionCallbackInfo& args } /** - * Search through this actor's hierarchy for an actor with the given name or alias. - * - * Actors can customize this function to provide actors with preferred alias' - * For example 'previous' could return the last selected child. - * If no aliased actor is found then FindChildByName() is called. - * - * @for Actor - * @method findChildByAlias - * @param {String} actor alias - * @return {Object} actor on success, empty actor handle if not found - */ -void ActorApi::FindChildByAlias( const v8::FunctionCallbackInfo& args ) -{ - v8::Isolate* isolate = args.GetIsolate(); - v8::HandleScope handleScope( isolate ); - Actor parent = GetActor( isolate, args ); - bool found( false ); - std::string name = V8Utils::GetStringParameter( PARAMETER_0, found, isolate, args ); - if( !found ) - { - DALI_SCRIPT_EXCEPTION( isolate, "String parameter not found" ); - return; - } - Actor childActor = parent.FindChildByAlias( name ); - if( childActor ) - { - // wrap the child - v8::Local < v8::Object > wrappedLayer = ActorWrapper::WrapActor( isolate, childActor ); - args.GetReturnValue().Set( wrappedLayer ); - } -} - -/** * Search through this actor's hierarchy for an actor with the given unique ID. * The actor itself is also considered in the search * diff --git a/plugins/dali-script-v8/src/actors/actor-api.h b/plugins/dali-script-v8/src/actors/actor-api.h index 38bc95a..8b27961 100644 --- a/plugins/dali-script-v8/src/actors/actor-api.h +++ b/plugins/dali-script-v8/src/actors/actor-api.h @@ -58,7 +58,6 @@ namespace ActorApi void Unparent( const v8::FunctionCallbackInfo< v8::Value >& args); void GetChildAt( const v8::FunctionCallbackInfo< v8::Value >& args); void FindChildByName( const v8::FunctionCallbackInfo< v8::Value >& args); - void FindChildByAlias( const v8::FunctionCallbackInfo< v8::Value >& args); void FindChildById( const v8::FunctionCallbackInfo< v8::Value >& args); void GetParent( const v8::FunctionCallbackInfo< v8::Value >& args ); void GetChildCount( const v8::FunctionCallbackInfo< v8::Value >& args ); diff --git a/plugins/dali-script-v8/src/actors/actor-wrapper.cpp b/plugins/dali-script-v8/src/actors/actor-wrapper.cpp index 7d10f3a..dded413 100644 --- a/plugins/dali-script-v8/src/actors/actor-wrapper.cpp +++ b/plugins/dali-script-v8/src/actors/actor-wrapper.cpp @@ -199,7 +199,6 @@ const ActorFunctions ActorFunctionTable[]= { "GetChildCount", ActorApi::GetChildCount, ACTOR_API }, { "GetChildAt" , ActorApi::GetChildAt, ACTOR_API }, { "FindChildByName", ActorApi::FindChildByName, ACTOR_API }, - { "FindChildByAlias", ActorApi::FindChildByAlias, ACTOR_API }, { "FindChildById", ActorApi::FindChildById, ACTOR_API }, { "GetParent" , ActorApi::GetParent, ACTOR_API }, { "GetActorType" , ActorApi::GetActorType, ACTOR_API }, // custom for javascript