X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisuals%2Fvisual-properties-devel.h;h=019b632dd5ce569daf5f0884a035cdf12b3ac2e0;hp=8f7248fcf4ff06d932624f2eb7bb3e9ff0cc2ec8;hb=d28d8f3cbe9319ce809582b7a0becccc374d8192;hpb=fb545906ceea3a2946c8a451f34ea7da283c4ffe diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h index 8f7248f..019b632 100644 --- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_DEVEL_API_VISUALS_VISUAL_PROPERTIES_DEVEL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,97 +35,21 @@ namespace DevelVisual */ enum Type { - BORDER = Dali::Toolkit::Visual::BORDER, - COLOR = Dali::Toolkit::Visual::COLOR, - GRADIENT = Dali::Toolkit::Visual::GRADIENT, - IMAGE = Dali::Toolkit::Visual::IMAGE, - MESH = Dali::Toolkit::Visual::MESH, - PRIMITIVE = Dali::Toolkit::Visual::PRIMITIVE, - WIREFRAME = Dali::Toolkit::Visual::WIREFRAME, - - TEXT = WIREFRAME + 1, ///< Renders text. -}; - -namespace Property -{ - -enum Type -{ - TYPE = Dali::Toolkit::Visual::Property::TYPE, - SHADER = Dali::Toolkit::Visual::Property::SHADER, - - /** - * @brief The transform used by the visual. - * @details Name "transform", type Property::Map. - - * @note Optional. - * @see DevelVisual::Transform::Property - */ - TRANSFORM = SHADER + 1, // Dali::Toolkit::Visual::Property::SHADER + 1 - - /** - * @brief Enables/disables premultiplied alpha. - * The premultiplied alpha is false by default unless this behaviour is modified - * by the derived Visual type. - - * @details Name "premultipliedAlpha", type Property::Boolean. - - * @note Optional. - */ - PREMULTIPLIED_ALPHA = SHADER + 2, // Dali::Toolkit::Visual::Property::SHADER + 2 + BORDER = Dali::Toolkit::Visual::BORDER, + COLOR = Dali::Toolkit::Visual::COLOR, + GRADIENT = Dali::Toolkit::Visual::GRADIENT, + IMAGE = Dali::Toolkit::Visual::IMAGE, + MESH = Dali::Toolkit::Visual::MESH, + PRIMITIVE = Dali::Toolkit::Visual::PRIMITIVE, + WIREFRAME = Dali::Toolkit::Visual::WIREFRAME, + TEXT = Dali::Toolkit::Visual::TEXT, + N_PATCH = Dali::Toolkit::Visual::N_PATCH, + SVG = Dali::Toolkit::Visual::SVG, + ANIMATED_IMAGE = Dali::Toolkit::Visual::ANIMATED_IMAGE, + + ANIMATED_GRADIENT = ANIMATED_IMAGE + 1, ///< Renders an animated gradient. }; -} //namespace Property - -namespace Transform -{ - -namespace Property -{ - -enum Type -{ - /** - * @brief Offset of the visual. It can be either relative (percentage of the parent) - * or absolute (in world units). - * @details Name "offset", type Property::VECTOR2 - */ - OFFSET, - - /** - * @brief Size of the visual. It can be either relative (percentage of the parent) - * or absolute (in world units). - * @details Name "size", type Property::VECTOR2 - */ - SIZE, - - /** - * @brief The origin of the visual within its control area. - * @details Name "origin", type Align::Type (Property::INTEGER) or Property::STRING. - * @see Toolkit::Align - */ - ORIGIN, - - /** - * @brief The anchor-point of the visual - * @details Name "anchorPoint", type Align::Type (Property::INTEGER) or Property::STRING. - * @see Toolkit::Align - */ - ANCHOR_POINT, - - /** - * @brief Indicates which components of the offset and size are relative - * (percentage of the parent) or absolute (in world units). - * 0 indicates the component is relative, and 1 absolute. - * @details Name "offsetSizeMode", type Property::VECTOR4 - */ - OFFSET_SIZE_MODE -}; - -} //namespace Property - -} // namespace Transform - } // namespace DevelVisual } // namespace Toolkit