X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-base.h;h=94db5c49f355b9dcd7ba3457320de0331e52629c;hb=9eecb41468197eb2fc03e55c151011ea387e1bed;hp=4e2e0f529a4af4c0a55f2c0aaad02240a4ad09e6;hpb=98de7da7b7768f266b3e9579ede04ec421bfe596;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h old mode 100644 new mode 100755 index 4e2e0f5..94db5c4 --- a/dali-toolkit/devel-api/visual-factory/visual-base.h +++ b/dali-toolkit/devel-api/visual-factory/visual-base.h @@ -1,7 +1,7 @@ #ifndef DALI_TOOLKIT_VISUAL_BASE_H #define DALI_TOOLKIT_VISUAL_BASE_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -21,6 +21,9 @@ #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -37,6 +40,7 @@ class Base; namespace Visual { + /** * @brief A Visual provides a renderer for drawing a control component. A control may have multiple visuals. * @@ -67,8 +71,8 @@ namespace Visual * | size | VECTOR2 | No | (1,1) | size of visual | * | origin | INTEGER or STRING | No | CENTER | origin of the visual @sa Dali::Toolkit::Align | * | anchorPoint | INTEGER or STRING | No | CENTER | anchor point of the visual @sa Dali::Toolkit::Align | - * | offsetPolicy | VECTOR2 | No | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::DevelVisual::Transform::Policy | - * | sizePolicy | VECTOR2 | No | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::DevelVisual::Transform::Policy | + * | offsetPolicy | VECTOR2 | No | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::Visual::Transform::Policy | + * | sizePolicy | VECTOR2 | No | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::Visual::Transform::Policy | * * Relative means that the component describes a factor of the parent control size; * size.x = 1 means full width; size.y = 0.5 means half height. @@ -76,7 +80,7 @@ namespace Visual * Absolute means that the component describes world units (equivalent to pixels) * */ -class DALI_IMPORT_API Base : public BaseHandle +class DALI_TOOLKIT_API Base : public BaseHandle { public: @@ -121,7 +125,7 @@ public: * Used by the styling system to animate properties * @return The name of the visual */ - const std::string& GetName(); + const std::string& GetName() const; /** * @brief Sets the transform and the control size @@ -170,14 +174,14 @@ public: * * @param[in] index The depth index of this visual. */ - void SetDepthIndex( float index ); + void SetDepthIndex( int index ); /** * @brief Get the depth index of this visual * * @return The depth index of this visual. */ - float GetDepthIndex() const; + int GetDepthIndex() const; /** * @brief Create the property map representing this visual.