From 73199bc0aa04afa2bc9cd3b878c208d4326744b4 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 10 Jan 2018 22:21:41 +1100
Subject: [PATCH] don't pointlessly create same font 3 times in FilesScreen

---
 ClassicalSharp/2D/Screens/Menu/FilesScreen.cs | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/ClassicalSharp/2D/Screens/Menu/FilesScreen.cs b/ClassicalSharp/2D/Screens/Menu/FilesScreen.cs
index 93ae6c73e..1ba600722 100644
--- a/ClassicalSharp/2D/Screens/Menu/FilesScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/FilesScreen.cs
@@ -11,7 +11,7 @@ namespace ClassicalSharp.Gui.Screens {
 			HandlesAllInput = true;
 		}
 		
-		protected Font textFont, arrowFont, titleFont;
+		protected Font font;
 		protected string[] entries;
 		protected int currentIndex;
 		protected ButtonWidget[] buttons;
@@ -21,10 +21,7 @@ namespace ClassicalSharp.Gui.Screens {
 		protected string titleText;
 		
 		public override void Init() {
-			textFont = new Font(game.FontName, 16, FontStyle.Bold);
-			arrowFont = new Font(game.FontName, 16, FontStyle.Bold);
-			titleFont = new Font(game.FontName, 16, FontStyle.Bold);
-			
+			font = new Font(game.FontName, 16, FontStyle.Bold);
 			ContextRecreated();
 			gfx.ContextLost += ContextLost;
 			gfx.ContextRecreated += ContextRecreated;
@@ -36,19 +33,19 @@ namespace ClassicalSharp.Gui.Screens {
 		}
 		
 		protected override void ContextRecreated() {
-			title = TextWidget.Create(game, titleText, titleFont)
+			title = TextWidget.Create(game, titleText, font)
 				.SetLocation(Anchor.Centre, Anchor.Centre, 0, -155);
 			
 			buttons = new ButtonWidget[] {
 				MakeText(0, -100, Get(0)),
 				MakeText(0, -50, Get(1)),
-				MakeText(0, 0, Get(2)),
+				MakeText(0,   0, Get(2)),
 				MakeText(0, 50, Get(3)),
 				MakeText(0, 100, Get(4)),
 				
 				Make(-220, 0, "<", MoveBackwards),
 				Make(220, 0, ">", MoveForwards),
-				MakeBack(false, titleFont, SwitchPause),
+				MakeBack(false, font, SwitchPause),
 			};
 			UpdateArrows();
 		}
@@ -61,22 +58,19 @@ namespace ClassicalSharp.Gui.Screens {
 		}
 		
 		public override void Dispose() {
+			font.Dispose();
 			ContextLost();
 			gfx.ContextLost -= ContextLost;
 			gfx.ContextRecreated -= ContextRecreated;
-			
-			textFont.Dispose();
-			arrowFont.Dispose();
-			titleFont.Dispose();
 		}
 		
 		ButtonWidget MakeText(int x, int y, string text) {
-			return ButtonWidget.Create(game, 300, text, textFont, TextButtonClick)
+			return ButtonWidget.Create(game, 300, text, font, TextButtonClick)
 				.SetLocation(Anchor.Centre, Anchor.Centre, x, y);
 		}
 		
 		ButtonWidget Make(int x, int y, string text, SimpleClickHandler onClick) {
-			return ButtonWidget.Create(game, 40, text, arrowFont, LeftOnly(onClick))
+			return ButtonWidget.Create(game, 40, text, font, LeftOnly(onClick))
 				.SetLocation(Anchor.Centre, Anchor.Centre, x, y);
 		}