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
Added ability to have strings over multiple lines in JSON using a Property Array
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
visuals
/
visual-properties.h
diff --git
a/dali-toolkit/public-api/visuals/visual-properties.h
b/dali-toolkit/public-api/visuals/visual-properties.h
index
e5f7431
..
65d452a
100644
(file)
--- a/
dali-toolkit/public-api/visuals/visual-properties.h
+++ b/
dali-toolkit/public-api/visuals/visual-properties.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_VISUAL_PROPERTIES_H
/*
#define DALI_TOOLKIT_VISUAL_PROPERTIES_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-87,7
+87,8
@@
enum
{
/**
* @brief The vertex shader.
{
/**
* @brief The vertex shader.
- * @details Name "vertexShader", type Property::STRING.
+ * @details Name "vertexShader", type Property::STRING or Property::ARRAY of Property::STRING.
+ * A Property::ARRAY of Property::STRING values can be used to split the shader string over multiple lines.
* @SINCE_1_1.45
* @note Optional
* @note If not supplied, the visual's already set vertex shader is used.
* @SINCE_1_1.45
* @note Optional
* @note If not supplied, the visual's already set vertex shader is used.
@@
-96,7
+97,8
@@
enum
/**
* @brief The fragment shader.
/**
* @brief The fragment shader.
- * @details Name "fragmentShader", type Property::STRING.
+ * @details Name "fragmentShader", type Property::STRING or Property::ARRAY of Property::STRING.
+ * A Property::ARRAY of Property::STRING values can be used to split the shader string over multiple lines.
* @SINCE_1_1.45
* @note Optional
* @note If not supplied, the visual's already set fragment shader is used.
* @SINCE_1_1.45
* @note Optional
* @note If not supplied, the visual's already set fragment shader is used.