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
[dali_1.9.17] Merge branch 'devel/master'
[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
old mode 100644
(file)
new mode 100755
(executable)
index
54a0310
..
0d6fd9e
--- 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) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-21,6
+21,10
@@
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/actors/actor.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
{
@@
-77,7
+81,7
@@
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:
@@
-122,7
+126,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
@@
-187,6
+191,13
@@
public:
*/
void CreatePropertyMap( Dali::Property::Map& map ) const;
*/
void CreatePropertyMap( Dali::Property::Map& map ) const;
+ /**
+ * @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);
public: // Not intended for application developers
explicit DALI_INTERNAL Base(Internal::Visual::Base *impl);