From b8c6f35737d76c86fe9e7b4f443a3682f718f29c Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Fri, 6 Mar 2015 17:58:12 +0000 Subject: [PATCH] dali-toolkit property type comment to represent type instead of property enum Change-Id: I58ce015f18dc309f4d7f3fd7b84a2e7dd488e436 --- dali-toolkit/public-api/controls/buttons/button.h | 20 +++++------ dali-toolkit/public-api/controls/cluster/cluster.h | 2 +- dali-toolkit/public-api/controls/control.h | 14 ++++---- .../controls/image-view/masked-image-view.h | 10 +++--- .../public-api/controls/magnifier/magnifier.h | 2 +- .../public-api/controls/scroll-bar/scroll-bar.h | 8 ++--- .../controls/scrollable/scroll-view/scroll-view.h | 22 ++++++------ .../public-api/controls/scrollable/scrollable.h | 12 +++---- dali-toolkit/public-api/controls/slider/slider.h | 40 +++++++++++----------- .../controls/super-blur-view/super-blur-view.h | 2 +- .../public-api/controls/table-view/table-view.h | 16 ++++----- .../public-api/controls/text-input/text-input.h | 32 ++++++++--------- .../public-api/controls/text-view/text-view.h | 20 +++++------ 13 files changed, 100 insertions(+), 100 deletions(-) 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.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/controls/text-input/text-input.h b/dali-toolkit/public-api/controls/text-input/text-input.h index 6c52934..0598988 100644 --- a/dali-toolkit/public-api/controls/text-input/text-input.h +++ b/dali-toolkit/public-api/controls/text-input/text-input.h @@ -58,22 +58,22 @@ public: { enum { - HIGHLIGHT_COLOR = PROPERTY_START_INDEX, // Property, name "highlight-color", type VECTOR4 - CUT_AND_PASTE_COLOR, // Property, name "cut-and-paste-bg-color", type VECTOR4 - CUT_AND_PASTE_PRESSED_COLOR, // Property, name "cut-and-paste-pressed-color", type VECTOR4 - CUT_AND_PASTE_BORDER_COLOR, // Property, name "cut-and-paste-border-color", type VECTOR4 - CUT_AND_PASTE_ICON_COLOR, // Property, name "cut-and-paste-icon-color", type VECTOR4 - CUT_AND_PASTE_ICON_PRESSED_COLOR, // Property, name "cut-and-paste-icon-pressed-color", type VECTOR4 - CUT_AND_PASTE_TEXT_COLOR, // Property, name "cut-and-paste-text-color", type VECTOR4 - CUT_AND_PASTE_TEXT_PRESSED_COLOR, // Property, name "cut-and-paste-text-pressed-color", type VECTOR4 - CUT_BUTTON_POSITION_PRIORITY, // Property, name "cut-button-position-priority", type UNSIGNED_INTEGER - COPY_BUTTON_POSITION_PRIORITY, // Property, name "copy-button-position-priority", type UNSIGNED_INTEGER - PASTE_BUTTON_POSITION_PRIORITY, // Property, name "paste-button-position-priority", type UNSIGNED_INTEGER - SELECT_BUTTON_POSITION_PRIORITY, // Property, name "select-button-position-priority", type UNSIGNED_INTEGER - SELECT_ALL_BUTTON_POSITION_PRIORITY, // Property, name "select-all-button-position-priority", type UNSIGNED_INTEGER - CLIPBOARD_BUTTON_POSITION_PRIORITY, // Property, name "clipboard-button-position-priority", type UNSIGNED_INTEGER - POP_UP_OFFSET_FROM_TEXT, // Property, name "popup-offset-from-text", type VECTOR4 - CURSOR_COLOR, // Property, name "cursor-color", type VECTOR4 + HIGHLIGHT_COLOR = PROPERTY_START_INDEX, // Property, name "highlight-color", type Vector4 + CUT_AND_PASTE_COLOR, // Property, name "cut-and-paste-bg-color", type Vector4 + CUT_AND_PASTE_PRESSED_COLOR, // Property, name "cut-and-paste-pressed-color", type Vector4 + CUT_AND_PASTE_BORDER_COLOR, // Property, name "cut-and-paste-border-color", type Vector4 + CUT_AND_PASTE_ICON_COLOR, // Property, name "cut-and-paste-icon-color", type Vector4 + CUT_AND_PASTE_ICON_PRESSED_COLOR, // Property, name "cut-and-paste-icon-pressed-color", type Vector4 + CUT_AND_PASTE_TEXT_COLOR, // Property, name "cut-and-paste-text-color", type Vector4 + CUT_AND_PASTE_TEXT_PRESSED_COLOR, // Property, name "cut-and-paste-text-pressed-color", type Vector4 + CUT_BUTTON_POSITION_PRIORITY, // Property, name "cut-button-position-priority", type unsigned int + COPY_BUTTON_POSITION_PRIORITY, // Property, name "copy-button-position-priority", type unsigned int + PASTE_BUTTON_POSITION_PRIORITY, // Property, name "paste-button-position-priority", type unsigned int + SELECT_BUTTON_POSITION_PRIORITY, // Property, name "select-button-position-priority", type unsigned int + SELECT_ALL_BUTTON_POSITION_PRIORITY, // Property, name "select-all-button-position-priority", type unsigned int + CLIPBOARD_BUTTON_POSITION_PRIORITY, // Property, name "clipboard-button-position-priority", type unsigned int + POP_UP_OFFSET_FROM_TEXT, // Property, name "popup-offset-from-text", type Vector4 + CURSOR_COLOR, // Property, name "cursor-color", type Vector4 }; }; diff --git a/dali-toolkit/public-api/controls/text-view/text-view.h b/dali-toolkit/public-api/controls/text-view/text-view.h index 04d46a6..0eb8024 100644 --- a/dali-toolkit/public-api/controls/text-view/text-view.h +++ b/dali-toolkit/public-api/controls/text-view/text-view.h @@ -68,16 +68,16 @@ public: { enum { - MARKUP_ENABLED = PROPERTY_START_INDEX, ///< name "markup-enabled", @see SetMarkupProcessingEnabled(), type BOOLEAN - TEXT, ///< name "text", @see SetText(), type STRING - MULTILINE_POLICY, ///< name "multiline-policy", @see SetMultilinePolicy(), type STRING - WIDTH_EXCEED_POLICY, ///< name "width-exceed-policy", @see SetWidthExceedPolicy(), type STRING - HEIGHT_EXCEED_POLICY, ///< name "height-exceed-policy", @see SetHeightExceedPolicy(), type STRING - LINE_JUSTIFICATION, ///< name "line-justification", @see SetLineJustification(), type STRING - FADE_BOUNDARY, ///< name "fade-boundary", @see SetFadeBoundary(), type VECTOR4 - LINE_HEIGHT_OFFSET, ///< name "line-height-offset", @see SetLineHeightOffset(), type FLOAT - HORIZONTAL_ALIGNMENT, ///< name "horizontal-alignment", @see SetTextAlignment(), type STRING - VERTICAL_ALIGNMENT, ///< name "vertical-alignment", @see SetTextAlignment(), type STRING + MARKUP_ENABLED = PROPERTY_START_INDEX, ///< name "markup-enabled", @see SetMarkupProcessingEnabled(), type bool + TEXT, ///< name "text", @see SetText(), type std::string + MULTILINE_POLICY, ///< name "multiline-policy", @see SetMultilinePolicy(), type std::string + WIDTH_EXCEED_POLICY, ///< name "width-exceed-policy", @see SetWidthExceedPolicy(), type std::string + HEIGHT_EXCEED_POLICY, ///< name "height-exceed-policy", @see SetHeightExceedPolicy(), type std::string + LINE_JUSTIFICATION, ///< name "line-justification", @see SetLineJustification(), type std::string + FADE_BOUNDARY, ///< name "fade-boundary", @see SetFadeBoundary(), type Vector4 + LINE_HEIGHT_OFFSET, ///< name "line-height-offset", @see SetLineHeightOffset(), type float + HORIZONTAL_ALIGNMENT, ///< name "horizontal-alignment", @see SetTextAlignment(), type std::string + VERTICAL_ALIGNMENT, ///< name "vertical-alignment", @see SetTextAlignment(), type std::string }; }; -- 2.7.4