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 Version 1.4.39
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
text
/
rendering-backend.h
diff --git
a/dali-toolkit/public-api/text/rendering-backend.h
b/dali-toolkit/public-api/text/rendering-backend.h
old mode 100644
(file)
new mode 100755
(executable)
index
1ffa35e
..
6c266f8
--- a/
dali-toolkit/public-api/text/rendering-backend.h
+++ b/
dali-toolkit/public-api/text/rendering-backend.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_RENDERING_BACKEND_H__
-#define
__DALI_TOOLKIT_RENDERING_BACKEND_H__
+#ifndef
DALI_TOOLKIT_RENDERING_BACKEND_H
+#define
DALI_TOOLKIT_RENDERING_BACKEND_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.
@@
-23,22
+23,33
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
+/**
+ * @addtogroup dali_toolkit_controls_text_controls
+ * @{
+ */
namespace Text
{
namespace Text
{
-// The type of text renderer required
+/**
+ * @brief Enumeration for the type of text renderer required.
+ * @SINCE_1_0.0
+ */
enum RenderingType
{
enum RenderingType
{
- RENDERING_SHARED_ATLAS ///< A bitmap-based solution where renderers can share a texture atlas
+ RENDERING_SHARED_ATLAS, ///< A bitmap-based solution where renderers can share a texture atlas @SINCE_1_0.0
+ RENDERING_VECTOR_BASED ///< A solution where glyphs are stored as vectors (scalable). Requires highp shader support. @SINCE_1_1.31
};
const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS;
} // namespace Text
};
const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS;
} // namespace Text
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_RENDERING_BACKEND_H__
+#endif //
DALI_TOOLKIT_RENDERING_BACKEND_H