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 "[AT-SPI] Add SetTextContents, InsertText and DeleteText" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
character-run.h
diff --git
a/dali-toolkit/internal/text/character-run.h
b/dali-toolkit/internal/text/character-run.h
index
221ecbd
..
51a3ef7
100644
(file)
--- a/
dali-toolkit/internal/text/character-run.h
+++ b/
dali-toolkit/internal/text/character-run.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_CHARACTER_RUN_H__
-#define
__DALI_TOOLKIT_TEXT_CHARACTER_RUN_H__
+#ifndef
DALI_TOOLKIT_TEXT_CHARACTER_RUN_H
+#define
DALI_TOOLKIT_TEXT_CHARACTER_RUN_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.
@@
-23,18
+23,27
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
/**
* @brief A run of consecutive characters.
*/
struct CharacterRun
{
/**
* @brief A run of consecutive characters.
*/
struct CharacterRun
{
+ CharacterRun()
+ : characterIndex{0u},
+ numberOfCharacters{0u}
+ {
+ }
+
+ CharacterRun(CharacterIndex characterIndex, Length numberOfCharacters)
+ : characterIndex{characterIndex},
+ numberOfCharacters{numberOfCharacters}
+ {
+ }
+
CharacterIndex characterIndex; ///< Index to the first character.
Length numberOfCharacters; ///< Number of characters in the run.
};
CharacterIndex characterIndex; ///< Index to the first character.
Length numberOfCharacters; ///< Number of characters in the run.
};
@@
-45,4
+54,4
@@
struct CharacterRun
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_CHARACTER_RUN_H__
+#endif //
DALI_TOOLKIT_TEXT_CHARACTER_RUN_H