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 2.1.46" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
text-atlas-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
index
7bc6177
..
678e458
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__
-#define
__DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__
+#ifndef
DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H
+#define
DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-20,17
+20,13
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
/**
* @brief Implementation of a text renderer based on dynamic atlases.
*
/**
* @brief Implementation of a text renderer based on dynamic atlases.
*
@@
-38,22
+34,21
@@
namespace Text
class AtlasRenderer : public Renderer
{
public:
class AtlasRenderer : public Renderer
{
public:
-
/**
* @brief Create the renderer.
*/
static RendererPtr New();
/**
/**
* @brief Create the renderer.
*/
static RendererPtr New();
/**
- * @brief Render the glyphs from a ViewInterface.
- *
- * @param[in] view The interface to a view.
- * @return The Renderable actor used to position the text.
+ * @copydoc Renderer::Render()
*/
*/
- virtual Actor Render( ViewInterface& view );
+ virtual Actor Render(ViewInterface& view,
+ Actor textControl,
+ Property::Index animatablePropertyIndex,
+ float& alignmentOffset,
+ int depth);
protected:
protected:
-
/**
* @brief Constructor.
*/
/**
* @brief Constructor.
*/
@@
-65,15
+60,13
@@
protected:
virtual ~AtlasRenderer();
private:
virtual ~AtlasRenderer();
private:
-
// Undefined
// Undefined
- AtlasRenderer(
const AtlasRenderer& handle
);
+ AtlasRenderer(
const AtlasRenderer& handle
);
// Undefined
// Undefined
- AtlasRenderer& operator=(
const AtlasRenderer& handle
);
+ AtlasRenderer& operator=(
const AtlasRenderer& handle
);
private:
private:
-
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};
@@
-84,4
+77,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__
+#endif //
DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H