Tighten up MeasureDrawBounds Y extents

yangyq2016 · Jun 7, 2016 · 8529936 · 8529936
1 parent a6d3dcc
commit 8529936
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Src/SpriteFont.cpp b/Src/SpriteFont.cpp
@@ -366,12 +366,10 @@ RECT SpriteFont::MeasureDrawBounds(_In_z_ wchar_t const* text, XMFLOAT2 const& p
     pImpl->ForEachGlyph(text, [&](Glyph const* glyph, float x, float y, float advance)
     {
         float w = (float)(glyph->Subrect.right - glyph->Subrect.left);
-        float h = (float)(glyph->Subrect.bottom - glyph->Subrect.top) + glyph->YOffset;
-
-        h = std::max(h, pImpl->lineSpacing);
+        float h = (float)(glyph->Subrect.bottom - glyph->Subrect.top);
 
-        float minX = (position.x + x);
-        float minY = (position.y + y);
+        float minX = position.x + x;
+        float minY = position.y + y + glyph->YOffset;
 
         float maxX = std::max(minX + advance, minX + w);
         float maxY = minY + h;