X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Funderlined-character-run.h;h=c16bca6a4ac990dfd5068185821e8e17eddc234f;hb=4d8dff121a1c79d5a545bc80b1a18b7f0f12beb5;hp=99d59672421612e41405d9e2cb2477a334de4c8c;hpb=ac501f02feab8e2fb7e613f936d3d5a511603001;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/underlined-character-run.h b/dali-toolkit/internal/text/underlined-character-run.h
index 99d5967..c16bca6 100644
--- a/dali-toolkit/internal/text/underlined-character-run.h
+++ b/dali-toolkit/internal/text/underlined-character-run.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_UNDERLINED_CHARACTER_RUN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -22,8 +22,8 @@
 #include <dali/public-api/math/vector4.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/character-run.h>
-#include <dali-toolkit/internal/text/glyph-run.h>
+#include <dali-toolkit/internal/text/abstract-style-character-run.h>
+#include <dali-toolkit/internal/text/underline-style-properties.h>
 
 namespace Dali
 {
@@ -34,18 +34,34 @@ namespace Text
 /**
  * @brief Run of underlined characters with same properties.
  */
-struct UnderlinedCharacterRun
+struct UnderlinedCharacterRun : public AbstractStyleCharacterRun
 {
-  CharacterRun characterRun; ///< The initial character index and the number of characters of the run.
-  //TODO: add properties like color, height and style
-  //Vector4      color;       ///< The color of underline.
-  //float        height;      ///< The height of underline.
+  /**
+   * Default constructor to set the default values of bitfields
+   */
+  UnderlinedCharacterRun()
+  : AbstractStyleCharacterRun(),
+    properties{}
+  {
+  }
+
+  UnderlineStyleProperties properties; /// The properties of underline style
 };
 
 } // namespace Text
 
 } // namespace Toolkit
 
+// Allow UnderlinedCharacterRun to be treated as a POD type
+template<>
+struct TypeTraits<Dali::Toolkit::Text::UnderlinedCharacterRun> : public Dali::BasicTypes<Dali::Toolkit::Text::UnderlinedCharacterRun>
+{
+  enum
+  {
+    IS_TRIVIAL_TYPE = true
+  };
+};
+
 } // namespace Dali
 
 #endif // DALI_TOOLKIT_TEXT_UNDERLINED_CHARACTER_RUN_H