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.4.21] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
builder
/
builder.h
diff --git
a/dali-toolkit/devel-api/builder/builder.h
b/dali-toolkit/devel-api/builder/builder.h
old mode 100644
(file)
new mode 100755
(executable)
index
0526510
..
f3975f6
--- a/
dali-toolkit/devel-api/builder/builder.h
+++ b/
dali-toolkit/devel-api/builder/builder.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_UIBUILDER_H__
-#define
__DALI_TOOLKIT_UIBUILDER_H__
+#ifndef
DALI_TOOLKIT_UIBUILDER_H
+#define
DALI_TOOLKIT_UIBUILDER_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-24,7
+24,9
@@
#include <dali/public-api/animation/linear-constrainer.h>
#include <dali/devel-api/animation/path-constrainer.h>
#include <dali/public-api/images/frame-buffer-image.h>
#include <dali/public-api/animation/linear-constrainer.h>
#include <dali/devel-api/animation/path-constrainer.h>
#include <dali/public-api/images/frame-buffer-image.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
namespace Dali
{
namespace Dali
{
@@
-119,7
+121,7
@@
class Builder;
*
*/
*
*/
-class DALI_
IMPOR
T_API Builder : public BaseHandle
+class DALI_
TOOLKI
T_API Builder : public BaseHandle
{
public:
/**
{
public:
/**
@@
-188,6
+190,14
@@
class DALI_IMPORT_API Builder : public BaseHandle
void AddConstant( const std::string& key, const Property::Value& value );
/**
void AddConstant( const std::string& key, const Property::Value& value );
/**
+ * @brief Gets all currently defined configurations.
+ *
+ * @pre The Builder has been initialized.
+ * @return A reference to the currently defined configurations.
+ */
+ const Property::Map& GetConfigurations() const;
+
+ /**
* @brief Gets all currently defined constants.
*
* e.g.
* @brief Gets all currently defined constants.
*
* e.g.
@@
-446,4
+456,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_UIBUILDER_H__
+#endif //
DALI_TOOLKIT_UIBUILDER_H