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 "DALi Version 1.9.30" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
vector-based
/
vector-based-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
index
9d95655
..
4a7e75b
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
-#define
__DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
+#ifndef
DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H
+#define
DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H
/*
/*
- * Copyright (c) 201
6
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.
@@
-47,6
+47,8
@@
public:
* @copydoc Renderer::Render()
*/
virtual Actor Render( ViewInterface& view,
* @copydoc Renderer::Render()
*/
virtual Actor Render( ViewInterface& view,
+ Actor textControl, // Functionality not supported but defined in interface
+ Property::Index animatablePropertyIndex, // Functionality not supported but defined in interface
float& alignmentOffset,
int depth );
float& alignmentOffset,
int depth );
@@
-82,4
+84,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__
+#endif //
DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H