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-Text: Keyboard Shortcuts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
text-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/text-renderer.h
b/dali-toolkit/internal/text/rendering/text-renderer.h
index
17be8d8
..
65fbf50
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/text-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/text-renderer.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_RENDERER_H__
-#define
__DALI_TOOLKIT_TEXT_RENDERER_H__
+#ifndef
DALI_TOOLKIT_TEXT_RENDERER_H
+#define
DALI_TOOLKIT_TEXT_RENDERER_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,9
+23,6
@@
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/object/ref-object.h>
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/text-view-interface.h>
-
namespace Dali
{
namespace Dali
{
@@
-38,11
+35,13
@@
namespace Text
class Renderer;
typedef IntrusivePtr<Renderer> RendererPtr;
class Renderer;
typedef IntrusivePtr<Renderer> RendererPtr;
+class ViewInterface;
+
/**
* @brief Abstract base class for Text renderers.
*
* This is reponsible for rendering the glyphs from a ViewInterface in the specified positions.
/**
* @brief Abstract base class for Text renderers.
*
* This is reponsible for rendering the glyphs from a ViewInterface in the specified positions.
- * It is implemented by returning a
Renderable
Actor intended as the child of a UI control.
+ * It is implemented by returning a
n
Actor intended as the child of a UI control.
*/
class Renderer : public RefObject
{
*/
class Renderer : public RefObject
{
@@
-52,10
+51,17
@@
public:
* @brief Render the glyphs from a ViewInterface.
*
* @param[in] view The interface to a view.
* @brief Render the glyphs from a ViewInterface.
*
* @param[in] view The interface to a view.
+ * @param[in] textControl handle to the text control
+ * @param[in] animatablePropertyIndex textControl specific animatable property
+ * @param[out] alignmentOffset Offset used to internally align the placement actor.
* @param[in] depth The depth in the tree of the parent.
* @return The Renderable actor used to position the text.
*/
* @param[in] depth The depth in the tree of the parent.
* @return The Renderable actor used to position the text.
*/
- virtual Actor Render( ViewInterface& view, int depth ) = 0;
+ virtual Actor Render( ViewInterface& view,
+ Actor textContol,
+ Property::Index animatablePropertyIndex,
+ float& alignmentOffset,
+ int depth ) = 0;
protected:
protected:
@@
-84,4
+90,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_RENDERER_H__
+#endif //
DALI_TOOLKIT_TEXT_RENDERER_H