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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / view-model.cpp

diff --git a/dali-toolkit/internal/text/rendering/view-model.cpp b/dali-toolkit/internal/text/rendering/view-model.cpp
index 9cfba93..3799fc9 100644 (file)
--- a/dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/dali-toolkit/internal/text/rendering/view-model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -93,7 +93,7 @@ Length ViewModel::GetNumberOfLines() const
   return mModel->GetNumberOfLines();
 }
 
-const LineRun* const ViewModel::GetLines() const
+const LineRun* ViewModel::GetLines() const
 {
   return mModel->GetLines();
 }
@@ -103,11 +103,16 @@ Length ViewModel::GetNumberOfScripts() const
   return mModel->GetNumberOfScripts();
 }
 
-const ScriptRun* const ViewModel::GetScriptRuns() const
+const ScriptRun* ViewModel::GetScriptRuns() const
 {
   return mModel->GetScriptRuns();
 }
 
+Length ViewModel::GetNumberOfCharacters() const
+{
+  return mModel->GetNumberOfCharacters();
+}
+
 Length ViewModel::GetNumberOfGlyphs() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
@@ -162,7 +167,7 @@ GlyphIndex ViewModel::GetSecondMiddleIndexOfElidedGlyphs() const
   return mModel->GetSecondMiddleIndexOfElidedGlyphs();
 }
 
-const GlyphInfo* const ViewModel::GetGlyphs() const
+const GlyphInfo* ViewModel::GetGlyphs() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
   {
@@ -176,7 +181,7 @@ const GlyphInfo* const ViewModel::GetGlyphs() const
   return NULL;
 }
 
-const Vector2* const ViewModel::GetLayout() const
+const Vector2* ViewModel::GetLayout() const
 {
   if(mIsTextElided && mModel->IsTextElideEnabled())
   {
@@ -190,27 +195,27 @@ const Vector2* const ViewModel::GetLayout() const
   return NULL;
 }
 
-const Vector4* const ViewModel::GetColors() const
+const Vector4* ViewModel::GetColors() const
 {
   return mModel->GetColors();
 }
 
-const ColorIndex* const ViewModel::GetColorIndices() const
+const ColorIndex* ViewModel::GetColorIndices() const
 {
   return mModel->GetColorIndices();
 }
 
-const Vector4* const ViewModel::GetBackgroundColors() const
+const Vector4* ViewModel::GetBackgroundColors() const
 {
   return mModel->GetBackgroundColors();
 }
 
-const ColorIndex* const ViewModel::GetBackgroundColorIndices() const
+const ColorIndex* ViewModel::GetBackgroundColorIndices() const
 {
   return mModel->GetBackgroundColorIndices();
 }
 
-bool const ViewModel::IsMarkupBackgroundColorSet() const
+bool ViewModel::IsMarkupBackgroundColorSet() const
 {
   return mModel->IsMarkupBackgroundColorSet();
 }
@@ -245,6 +250,11 @@ bool ViewModel::IsUnderlineEnabled() const
   return mModel->IsUnderlineEnabled();
 }
 
+bool ViewModel::IsMarkupUnderlineSet() const
+{
+  return mModel->IsMarkupUnderlineSet();
+}
+
 float ViewModel::GetUnderlineHeight() const
 {
   return mModel->GetUnderlineHeight();
@@ -300,6 +310,11 @@ bool ViewModel::IsMarkupProcessorEnabled() const
   return mModel->IsMarkupProcessorEnabled();
 }
 
+bool ViewModel::IsSpannedTextPlaced() const
+{
+  return mModel->IsSpannedTextPlaced();
+}
+
 const GlyphInfo* ViewModel::GetHyphens() const
 {
   return mModel->GetHyphens();
@@ -315,7 +330,7 @@ Length ViewModel::GetHyphensCount() const
   return mModel->GetHyphensCount();
 }
 
-const float ViewModel::GetCharacterSpacing() const
+float ViewModel::GetCharacterSpacing() const
 {
   return mModel->GetCharacterSpacing();
 }
@@ -699,6 +714,11 @@ bool ViewModel::IsStrikethroughEnabled() const
   return mModel->IsStrikethroughEnabled();
 }
 
+bool ViewModel::IsMarkupStrikethroughSet() const
+{
+  return mModel->IsMarkupStrikethroughSet();
+}
+
 Length ViewModel::GetNumberOfStrikethroughRuns() const
 {
   return mModel->GetNumberOfStrikethroughRuns();
@@ -729,6 +749,16 @@ const Vector<CharacterSpacingGlyphRun>& ViewModel::GetCharacterSpacingGlyphRuns(
   return mModel->GetCharacterSpacingGlyphRuns();
 }
 
+const Vector<FontRun>& ViewModel::GetFontRuns() const
+{
+  return mModel->GetFontRuns();
+}
+
+const Vector<FontDescriptionRun>& ViewModel::GetFontDescriptionRuns() const
+{
+  return mModel->GetFontDescriptionRuns();
+}
+
 } // namespace Text
 
 } // namespace Toolkit