projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add clockwise and counter clockwise direction type and movefocus" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visual-factory
/
visual-base.h
diff --git
a/dali-toolkit/devel-api/visual-factory/visual-base.h
b/dali-toolkit/devel-api/visual-factory/visual-base.h
index
54a0310
..
3b03dbe
100644
(file)
--- 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
/*
#ifndef DALI_TOOLKIT_VISUAL_BASE_H
#define DALI_TOOLKIT_VISUAL_BASE_H
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,26
+18,27
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
namespace Visual
{
class Base;
}
namespace Internal DALI_INTERNAL
{
namespace Visual
{
class Base;
}
-}
+}
// namespace DALI_INTERNAL
namespace Visual
{
namespace Visual
{
-
/**
* @brief A Visual provides a renderer for drawing a control component. A control may have multiple visuals.
*
/**
* @brief A Visual provides a renderer for drawing a control component. A control may have multiple visuals.
*
@@
-77,10
+78,9
@@
namespace Visual
* Absolute means that the component describes world units (equivalent to pixels)
*
*/
* Absolute means that the component describes world units (equivalent to pixels)
*
*/
-class DALI_
IMPOR
T_API Base : public BaseHandle
+class DALI_
TOOLKI
T_API Base : public BaseHandle
{
public:
{
public:
-
/**
* @brief Create an empty Visual Handle
*/
/**
* @brief Create an empty Visual Handle
*/
@@
-98,7
+98,7
@@
public:
*
* @param[in] handle A reference to the copied handle.
*/
*
* @param[in] handle A reference to the copied handle.
*/
- Base(
const Base& handle
);
+ Base(
const Base& handle
);
/**
* @brief This assignment operator is required for (smart) pointer semantics.
/**
* @brief This assignment operator is required for (smart) pointer semantics.
@@
-106,7
+106,7
@@
public:
* @param [in] handle A reference to the copied handle.
* @return A reference to this.
*/
* @param [in] handle A reference to the copied handle.
* @return A reference to this.
*/
- Base& operator=(
const Base& handle
);
+ Base& operator=(
const Base& handle
);
/**
* @brief Set the name of the visual
/**
* @brief Set the name of the visual
@@
-114,7
+114,7
@@
public:
* Used by the styling system to animate properties
* @param[in] name The name to give the visual
*/
* Used by the styling system to animate properties
* @param[in] name The name to give the visual
*/
- void SetName(
const std::string& name
);
+ void SetName(
const std::string& name
);
/**
* @brief Get the name of the visual
/**
* @brief Get the name of the visual
@@
-122,7
+122,7
@@
public:
* Used by the styling system to animate properties
* @return The name of the visual
*/
* 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
/**
* @brief Sets the transform and the control size
@@
-130,7
+130,7
@@
public:
* @param[in] transform A property map describing the transform
* @param[in] controlSize The size of the parent control for visuals that need to scale internally.
*/
* @param[in] transform A property map describing the transform
* @param[in] controlSize The size of the parent control for visuals that need to scale internally.
*/
- void SetTransformAndSize(
const Dali::Property::Map& transform, Size controlSize
);
+ void SetTransformAndSize(
const Dali::Property::Map& transform, Size controlSize
);
/**
* @brief Returns the height for a given width.
/**
* @brief Returns the height for a given width.
@@
-139,7
+139,7
@@
public:
*
* @return The height based on the width.
*/
*
* @return The height based on the width.
*/
- float GetHeightForWidth(
float width
);
+ float GetHeightForWidth(
float width
);
/**
* @brief Returns the width for a given height.
/**
* @brief Returns the width for a given height.
@@
-148,7
+148,7
@@
public:
*
* @return The width based on the height.
*/
*
* @return The width based on the height.
*/
- float GetWidthForHeight(
float height
);
+ float GetWidthForHeight(
float height
);
/**
* @brief Return the natural size of the visual.
/**
* @brief Return the natural size of the visual.
@@
-161,7
+161,7
@@
public:
*
* @param[out] naturalSize The visual's natural size
*/
*
* @param[out] naturalSize The visual's natural size
*/
- void GetNaturalSize(
Vector2& naturalSize
);
+ void GetNaturalSize(
Vector2& naturalSize
);
/**
* @brief Set the depth index of this visual.
/**
* @brief Set the depth index of this visual.
@@
-171,7
+171,7
@@
public:
*
* @param[in] index The depth index of this visual.
*/
*
* @param[in] index The depth index of this visual.
*/
- void SetDepthIndex(
int index
);
+ void SetDepthIndex(
int index
);
/**
* @brief Get the depth index of this visual
/**
* @brief Get the depth index of this visual
@@
-185,12
+185,17
@@
public:
*
* @param[out] map The visual property map.
*/
*
* @param[out] map The visual property map.
*/
- void CreatePropertyMap( Dali::Property::Map& map ) const;
-
-public: // Not intended for application developers
+ void CreatePropertyMap(Dali::Property::Map& map) const;
- explicit DALI_INTERNAL Base(Internal::Visual::Base *impl);
+ /**
+ * @brief Get the type of this visual.
+ *
+ * @return The the type of this visual.
+ */
+ Visual::Type GetType() const;
+public: // Not intended for application developers
+ explicit DALI_INTERNAL Base(Internal::Visual::Base* impl);
};
} // namespace Visual
};
} // namespace Visual