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
Add some APIs into web context.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-view.h
diff --git
a/dali-toolkit/internal/text/text-view.h
b/dali-toolkit/internal/text/text-view.h
old mode 100755
(executable)
new mode 100644
(file)
index
e600940
..
cc82820
--- a/
dali-toolkit/internal/text/text-view.h
+++ b/
dali-toolkit/internal/text/text-view.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_TEXT_VIEW_H
/*
#define DALI_TOOLKIT_TEXT_VIEW_H
/*
- * Copyright (c) 20
19
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.
@@
-24,20
+24,16
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
/**
* @brief View provides an interface between the Text layout engine and rendering back-end.
*/
class View : public ViewInterface
{
public:
/**
* @brief View provides an interface between the Text layout engine and rendering back-end.
*/
class View : public ViewInterface
{
public:
-
/**
* @brief Create a new instance of a View.
*/
/**
* @brief Create a new instance of a View.
*/
@@
-53,7
+49,7
@@
public:
*
* @param[in] visualModel The visual model used by the View.
*/
*
* @param[in] visualModel The visual model used by the View.
*/
- void SetVisualModel(
VisualModelPtr visualModel
);
+ void SetVisualModel(
VisualModelPtr visualModel
);
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize()
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize()
@@
-73,11
+69,11
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
*/
- virtual Length GetGlyphs(
GlyphInfo* glyphs,
-
Vector2*
glyphPositions,
-
float&
minLineOffset,
-
GlyphIndex glyphIndex,
-
Length numberOfGlyphs
) const;
+ virtual Length GetGlyphs(GlyphInfo* glyphs,
+
Vector2*
glyphPositions,
+
float&
minLineOffset,
+ GlyphIndex glyphIndex,
+
Length numberOfGlyphs
) const;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColors()
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColors()
@@
-137,9
+133,9
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns()
*/
- virtual void GetUnderlineRuns(
GlyphRun*
underlineRuns,
-
UnderlineRunIndex index,
-
Length numberOfRuns
) const;
+ virtual void GetUnderlineRuns(
GlyphRun*
underlineRuns,
+ UnderlineRunIndex index,
+
Length numberOfRuns
) const;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor()
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor()
@@
-152,15
+148,13
@@
public:
uint16_t GetOutlineWidth() const override;
private:
uint16_t GetOutlineWidth() const override;
private:
-
// Undefined
// Undefined
- View(
const View& handle
);
+ View(
const View& handle
);
// Undefined
// Undefined
- View& operator=(
const View& handle
);
+ View& operator=(
const View& handle
);
private:
private:
-
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};