// 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)
if(actor)
{
- Actor child_actor = actor.FindChildByAlias(childAlias);
+ Actor child_actor = actor.FindChildByName(childName);
if(child_actor)
{
}
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());
}
}
};
{
ChildActorAction action;
action.actorName = *actorName;
- action.childAlias = *childActorName;
+ action.childName = *childActorName;
action.actionName = *actionName;
GetParameters(child, action.parameters);
callback = action;
{
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
};
};
// 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:
return false; // Do not consume
}
-Actor Control::GetChildByAlias(const std::string& actorAlias)
-{
- return Actor();
-}
-
void Control::OnStageConnection()
{
RelayoutRequest();
*/
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.
/**
{
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
};
};
*/
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
};
// 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:
{
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
};
};
// 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
// 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.
{
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
};
};
{
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<FLOAT>
- 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<float>
+ SNAP_TO_MARKS, ///< Property, name "snap-to-marks", type bool
+ MARK_TOLERANCE, ///< Property, name "mark-tolerance", type float
};
};
{
enum
{
- IMAGE = PROPERTY_START_INDEX, ///< name "image", @see SetImage, type MAP
+ IMAGE = PROPERTY_START_INDEX, ///< name "image", @see SetImage, type Map
};
};
{
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
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
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
}
/**
- * 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<v8::Value>& 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
*
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 );
{ "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
projects / platform / core / uifw / dali-toolkit.git / commitdiff