From 12a87caa6510a195e299ad9c9fcf7d47cd224e9e Mon Sep 17 00:00:00 2001
From: MineBill <minebill@protonmail.com>
Date: Sat, 15 Feb 2025 20:12:13 +0200
Subject: [PATCH] Don't pass line height in `GetLineSpacing`

---
 BeefLibs/Beefy2D/src/gfx/Font.bf                  | 4 ++--
 BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf | 6 +++---
 IDE/src/ui/SourceEditWidgetContent.bf             | 8 ++++----
 IDE/src/ui/SourceViewPanel.bf                     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BeefLibs/Beefy2D/src/gfx/Font.bf b/BeefLibs/Beefy2D/src/gfx/Font.bf
index 2374045e..005c00b2 100644
--- a/BeefLibs/Beefy2D/src/gfx/Font.bf
+++ b/BeefLibs/Beefy2D/src/gfx/Font.bf
@@ -894,11 +894,11 @@ namespace Beefy.gfx
             return (int32)theString.Length;
         }
 
-        public float GetLineSpacing(float heightMultiplier = 1.0f)
+        public float GetLineSpacing()
         {
 			if (mFTFont == null)
 				return 0;
-            return mFTFont.mHeight * heightMultiplier;
+            return mFTFont.mHeight;
         }
 
 		public float GetHeight()
diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf
index d80365aa..e494d1c5 100644
--- a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf
+++ b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf
@@ -105,7 +105,7 @@ namespace Beefy.theme.dark
 			mLineCoords.GrowUninitialized(mData.mLineStarts.Count);
 			mLineCoordJumpTable.Clear();
 
-			float fontHeight = mFont.GetLineSpacing(mLineHeight);
+			float fontHeight = mFont.GetLineSpacing() * mLineHeight;
 			int prevJumpIdx = -1;
 			float jumpCoordSpacing = GetJumpCoordSpacing();
 
@@ -218,7 +218,7 @@ namespace Beefy.theme.dark
 		public float GetTextOffset()
 		{
 			float baseLineSpacing = mFont.GetLineSpacing();
-			float lineSpacing = mFont.GetLineSpacing(mLineHeight);
+			float lineSpacing = mFont.GetLineSpacing() * mLineHeight;
 			return lineSpacing / 2.0f - baseLineSpacing / 2.0f;
 		}
 
@@ -534,7 +534,7 @@ namespace Beefy.theme.dark
 
 #unwarn
             int lineCount = GetLineCount();
-            float lineSpacing = mFont.GetLineSpacing(mLineHeight);
+            float lineSpacing = mFont.GetLineSpacing() * mLineHeight;
 			float fontLineSpacing = mFont.GetLineSpacing();
 			float textYOffset = GetTextOffset();
 
diff --git a/IDE/src/ui/SourceEditWidgetContent.bf b/IDE/src/ui/SourceEditWidgetContent.bf
index 748985ff..dd4f010d 100644
--- a/IDE/src/ui/SourceEditWidgetContent.bf
+++ b/IDE/src/ui/SourceEditWidgetContent.bf
@@ -1216,7 +1216,7 @@ namespace IDE.ui
             {
                 bool isRenameSymbol = (IDEApp.sApp.mSymbolReferenceHelper != null) && (IDEApp.sApp.mSymbolReferenceHelper.mKind == SymbolReferenceHelper.Kind.Rename);
                 using (g.PushColor(isRenameSymbol ? (uint32)0x28FFFFFF : (uint32)0x18FFFFFF))
-                    g.FillRect(x, y, width, mFont.GetLineSpacing(mLineHeight));
+                    g.FillRect(x, y, width, mFont.GetLineSpacing() * mLineHeight);
 
                 DrawSectionFlagsOver(g, x, y, width, (uint8)(flags & ~(uint8)SourceElementFlags.SymbolReference));
                 return;
@@ -1225,7 +1225,7 @@ namespace IDE.ui
 			if ((flags & (uint8)SourceElementFlags.Find_CurrentSelection) != 0)
 			{
 			    using (g.PushColor(0x504C575C))
-			        g.FillRect(x, y, width, mFont.GetLineSpacing(mLineHeight));
+			        g.FillRect(x, y, width, mFont.GetLineSpacing() * mLineHeight);
 
 			    DrawSectionFlagsOver(g, x, y, width, (uint8)(flags & ~(uint8)(SourceElementFlags.Find_CurrentSelection | .Find_Matches)));
 			    return;
@@ -1234,7 +1234,7 @@ namespace IDE.ui
             if ((flags & (uint8)SourceElementFlags.Find_Matches) != 0)
             {
                 using (g.PushColor(0x50D0C090))
-                    g.FillRect(x, y, width, mFont.GetLineSpacing(mLineHeight));
+                    g.FillRect(x, y, width, mFont.GetLineSpacing() * mLineHeight);
 
                 DrawSectionFlagsOver(g, x, y, width, (uint8)(flags & ~(uint8)SourceElementFlags.Find_Matches));
                 return;
@@ -5852,7 +5852,7 @@ namespace IDE.ui
 			}
 			orderedEmitEmbeds.Sort(scope (lhs, rhs) => lhs.line <=> rhs.line);
 			
-			float fontHeight = mFont.GetLineSpacing(mLineHeight);
+			float fontHeight = mFont.GetLineSpacing() * mLineHeight;
 			int prevJumpIdx = -1;
 			float jumpCoordSpacing = GetJumpCoordSpacing();
 
diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf
index 3484b731..6d257d10 100644
--- a/IDE/src/ui/SourceViewPanel.bf
+++ b/IDE/src/ui/SourceViewPanel.bf
@@ -4550,7 +4550,7 @@ namespace IDE.ui
                 {
 					float editX = GetEditX();
 
-					float lineSpacing = ewc.mFont.GetLineSpacing(ewc.mLineHeight);
+					float lineSpacing = ewc.mFont.GetLineSpacing() * ewc.mLineHeight;
 					int cursorLineNumber = mEditWidget.mEditWidgetContent.CursorLineAndColumn.mLine;
 					bool hiliteCurrentLine = mEditWidget.mHasFocus;