diff --git a/Siv3D/src/Siv3D/Font/GlyphCache/BitmapGlyphCache.cpp b/Siv3D/src/Siv3D/Font/GlyphCache/BitmapGlyphCache.cpp index 79673f7d3..45bc04a95 100644 --- a/Siv3D/src/Siv3D/Font/GlyphCache/BitmapGlyphCache.cpp +++ b/Siv3D/src/Siv3D/Font/GlyphCache/BitmapGlyphCache.cpp @@ -106,12 +106,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) { @@ -220,12 +220,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) { diff --git a/Siv3D/src/Siv3D/Font/GlyphCache/MSDFGlyphCache.cpp b/Siv3D/src/Siv3D/Font/GlyphCache/MSDFGlyphCache.cpp index 713ec118a..ad2473632 100644 --- a/Siv3D/src/Siv3D/Font/GlyphCache/MSDFGlyphCache.cpp +++ b/Siv3D/src/Siv3D/Font/GlyphCache/MSDFGlyphCache.cpp @@ -105,12 +105,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) { @@ -219,12 +219,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) { diff --git a/Siv3D/src/Siv3D/Font/GlyphCache/SDFGlyphCache.cpp b/Siv3D/src/Siv3D/Font/GlyphCache/SDFGlyphCache.cpp index dac70e1f5..d2fb810eb 100644 --- a/Siv3D/src/Siv3D/Font/GlyphCache/SDFGlyphCache.cpp +++ b/Siv3D/src/Siv3D/Font/GlyphCache/SDFGlyphCache.cpp @@ -105,12 +105,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) { @@ -219,12 +219,12 @@ namespace s3d } updateTexture(); - const double dotXAdvance = m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance; const Vec2 areaBottomRight = area.br(); const auto& prop = font.getProperty(); const double scale = (size / prop.fontPixelSize); const double lineHeight = (prop.height() * scale * lineHeightScale); + const double dotXAdvance = (m_glyphTable.find(dotGlyphCluster[0].glyphIndex)->second.info.xAdvance * scale); if ((area.w < (dotXAdvance * 3)) || (area.h < lineHeight)) {