Purge underscored header file barriers

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

diff --git a/dali-toolkit/internal/text/line-run.h b/dali-toolkit/internal/text/line-run.h
index fd5371d..84fde1c 100644 (file)
--- 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) 2019 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.
@@ -18,11 +18,9 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <dali/public-api/math/vector2.h>
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/character-run.h>
+#include <dali-toolkit/internal/text/glyph-run.h>
 
 namespace Dali
 {
@@ -38,11 +36,16 @@ namespace Text
  */
 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.
-  Size         lineSize;       ///< The size of the line.
-  float        extraLength;    ///< The length of the white spaces at the end of the line.
+  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.
 };
 
 } // namespace Text
@@ -51,4 +54,4 @@ struct LineRun
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_LINE_RUN_H__
+#endif // DALI_TOOLKIT_TEXT_LINE_RUN_H