we need to allow baseline offset when calculate text position

3 files changed, 14 insertions, 0 deletions

diff --git a/graphics/glyph_layout.cpp b/graphics/glyph_layout.cpp
index fe1e546c09..7e9e0d86ad 100644
--- a/graphics/glyph_layout.cpp
+++ b/graphics/glyph_layout.cpp
@@ -518,4 +518,13 @@ namespace graphics
   {
     return m_fontDesc;
   }
+
+  int GlyphLayout::baseLineOffset()
+  {
+    int result = 0;
+    for (size_t i = 0; i < m_metrics.size(); ++i)
+      result = min(m_metrics[i].m_yOffset, result);
+
+    return -result;
+  }
 }
diff --git a/graphics/glyph_layout.hpp b/graphics/glyph_layout.hpp
index 356b93d27a..9ed34fcee4 100644
--- a/graphics/glyph_layout.hpp
+++ b/graphics/glyph_layout.hpp
@@ -120,5 +120,7 @@ namespace graphics
 
     m2::PointD const & offset() const;
     void setOffset(m2::PointD const & offs);
+
+    int baseLineOffset();
   };
 }
diff --git a/graphics/straight_text_element.cpp b/graphics/straight_text_element.cpp
index 5cab7fc41a..d3cb0a3cb4 100644
--- a/graphics/straight_text_element.cpp
+++ b/graphics/straight_text_element.cpp
@@ -129,6 +129,9 @@ namespace graphics
         m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxRes[i], graphics::EPosCenter));
     }
 
+    for (size_t i = 0; i < m_glyphLayouts.size(); ++i)
+      allElemHeight -= m_glyphLayouts[i].baseLineOffset();
+
     double curShift = allElemHeight / 2;
 
     /// performing aligning of glyphLayouts as for the center position