X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fline-run.h;h=f4d13e0955381ab2c8671036253232f1b91d5d4c;hb=803fc4e52d3fc95261c5af0b05c25d6bf243bc00;hp=69091829d7e5d6f90cae6b64307d55b16a2aa11d;hpb=cacac45f98aade99ec9bda47d126c3fb02eef79a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/line-run.h b/dali-toolkit/internal/text/line-run.h
index 6909182..f4d13e0 100644
--- a/dali-toolkit/internal/text/line-run.h
+++ b/dali-toolkit/internal/text/line-run.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_LINE_RUN_H__
-#define __DALI_TOOLKIT_TEXT_LINE_RUN_H__
+#ifndef DALI_TOOLKIT_TEXT_LINE_RUN_H
+#define DALI_TOOLKIT_TEXT_LINE_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.
@@ -20,31 +20,29 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/character-run.h>
+#include <dali-toolkit/internal/text/glyph-run.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Text
 {
-
 /**
  * @brief LineRun
  */
 struct LineRun
 {
-  GlyphIndex         glyphIndex;      ///< The initial glyph index.
-  Length             numberOfGlyphs;  ///< The number of glyphs of the run.
-  CharacterRun       characterRun;    ///< The initial character and the number of characters.
+  GlyphRun           glyphRun;        ///< The initial glyph index and the number of glyphs of the run.
+  CharacterRun       characterRun;    ///< The initial character index and the number of characters of the run.
   float              width;           ///< The line's width.
   float              ascender;        ///< The line's ascender.
   float              descender;       ///< The line's descender.
   float              extraLength;     ///< The length of the white spaces at the end of the line.
   float              alignmentOffset; ///< The horizontal alignment offset.
+  float              lineSpacing;     ///< The line's spacing
   CharacterDirection direction : 1;   ///< Direction of the first character of the paragraph.
-  bool               ellipsis  : 1;   ///< Wheter ellipsis is added to the line.
+  bool               ellipsis : 1;    ///< Wheter ellipsis is added to the line.
 };
 
 } // namespace Text
@@ -53,4 +51,4 @@ struct LineRun
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_LINE_RUN_H__
+#endif // DALI_TOOLKIT_TEXT_LINE_RUN_H