From 4a110002eb7f5870b1dcbcbf9fb21177a0380494 Mon Sep 17 00:00:00 2001
From: Raclamusi <61970673+Raclamusi@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:17:06 +0900
Subject: [PATCH] =?UTF-8?q?=E9=95=B7=E6=96=B9=E5=BD=A2=E5=86=85=E3=81=AE?=
 =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E6=8F=8F=E7=94=BB=E3=81=A7?=
 =?UTF-8?q?=E3=83=89=E3=83=83=E3=83=88=E3=81=AE=E9=96=93=E9=9A=94=E3=81=8C?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E3=82=B5=E3=82=A4=E3=82=BA?=
 =?UTF-8?q?=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E5=A4=89=E3=82=8F=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1273)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Siv3D/src/Siv3D/Font/GlyphCache/BitmapGlyphCache.cpp | 4 ++--
 Siv3D/src/Siv3D/Font/GlyphCache/MSDFGlyphCache.cpp   | 4 ++--
 Siv3D/src/Siv3D/Font/GlyphCache/SDFGlyphCache.cpp    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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))
 		{