Ignore vertical line alignment when the line spacing is negative

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

diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
index 1cd9d56..b1502a9 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@ -26,6 +26,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
 #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/line-helper-functions.h>
 #include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
 #include <dali-toolkit/internal/text/rendering/styles/strikethrough-helper-functions.h>
 #include <dali-toolkit/internal/text/rendering/styles/underline-helper-functions.h>
@@ -475,58 +476,6 @@ void DrawBackgroundColor(
   }
 }
 
-float GetPreOffsetVerticalLineAlignment(LineRun line, DevelText::VerticalLineAlignment::Type verLineAlign)
-{
-  // Calculate vertical line alignment
-  float offset = 0.0f;
-
-  switch(verLineAlign)
-  {
-    case DevelText::VerticalLineAlignment::TOP:
-    {
-      break;
-    }
-    case DevelText::VerticalLineAlignment::MIDDLE:
-    {
-      offset = line.lineSpacing * 0.5f;
-      break;
-    }
-    case DevelText::VerticalLineAlignment::BOTTOM:
-    {
-      offset = line.lineSpacing;
-      break;
-    }
-  }
-
-  return offset;
-}
-
-float GetPostOffsetVerticalLineAlignment(LineRun line, DevelText::VerticalLineAlignment::Type verLineAlign)
-{
-  // Calculate vertical line alignment
-  float offset = 0.0f;
-
-  switch(verLineAlign)
-  {
-    case DevelText::VerticalLineAlignment::TOP:
-    {
-      offset = line.lineSpacing;
-      break;
-    }
-    case DevelText::VerticalLineAlignment::MIDDLE:
-    {
-      offset = line.lineSpacing * 0.5f;
-      break;
-    }
-    case DevelText::VerticalLineAlignment::BOTTOM:
-    {
-      break;
-    }
-  }
-
-  return offset;
-}
-
 Devel::PixelBuffer DrawGlyphsBackground(const ViewModel* model, Devel::PixelBuffer& buffer, const uint32_t& bufferWidth, const uint32_t& bufferHeight, bool ignoreHorizontalAlignment, int32_t horizontalOffset, int32_t verticalOffset)
 {
   // Retrieve lines, glyphs, positions and colors from the view model.