[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / bidirectional-line-info-run.h

diff --git a/dali-toolkit/internal/text/bidirectional-line-info-run.h b/dali-toolkit/internal/text/bidirectional-line-info-run.h
index 9aeea2a..bffc7ef 100644 (file)
--- a/dali-toolkit/internal/text/bidirectional-line-info-run.h
+++ b/dali-toolkit/internal/text/bidirectional-line-info-run.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__
-#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__
+#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H
+#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H

 
 /*
 
 /*

- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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,20 +23,21 @@
 
 namespace Dali
 {
 
 namespace Dali
 {

-

 namespace Toolkit
 {
 namespace Toolkit
 {

-

 namespace Text
 {
 namespace Text
 {

-

 /**
  * @brief BidirectionalLineInfoRun
  */
 struct BidirectionalLineInfoRun
 {
 /**
  * @brief BidirectionalLineInfoRun
  */
 struct BidirectionalLineInfoRun
 {

-  CharacterRun    characterRun;       ///< The initial character index within the whole text and the number of characters of the run.
-  CharacterIndex* visualToLogicalMap; ///< Pointer to the visual to logical map table.
+  CharacterRun       characterRun;                  ///< The initial character index within the whole text and the number of characters of the run. In case the line is splitted by MIDDLE Ellipsis, this for the first half of line.
+  CharacterIndex*    visualToLogicalMap;            ///< Pointer to the visual to logical map table. In case the line is splitted by MIDDLE Ellipsis, this for the first half of line.
+  CharacterRun       characterRunForSecondHalfLine; ///< The initial character index within the whole text and the number of characters of the run for the second half of line.
+  CharacterIndex*    visualToLogicalMapSecondHalf;  ///< Pointer to the visual to logical map table for the second half of line.
+  CharacterDirection direction : 1;                 ///< Direction of the first character of the paragraph.
+  bool               isIdentity : 1;                ///< Whether the map is the identity.

 };
 
 } // namespace Text
 };
 
 } // namespace Text


@@ -45,4 +46,4 @@ struct BidirectionalLineInfoRun
 
 } // namespace Dali
 
 
 } // namespace Dali
 

-#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__
+#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H