長方形内のテキスト描画でドットの間隔がフォントサイズによって変わる問題を修正 (#1273)

Siv3D · Nov 17, 2024 · 4a11000 · 4a11000
1 parent 9bdeaf3
commit 4a11000
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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))
 		{