# HG changeset patch
# User Alys Brooks <alysbrooks@fastmail.com>
# Date 2021-06-23 06:39:12
# Node ID 5669a925df443b3c6b33b6e459854d5ebfb7b5db
# Parent  f1528e514ededb0d69b7d7d3702b0d2b2d74524f

Ensure scroll areas adjust with resolution change.

diff --git a/TODO.taskpaper b/TODO.taskpaper
--- a/TODO.taskpaper
+++ b/TODO.taskpaper
@@ -171,7 +171,7 @@
 		- Trees sometimes
 		- Sometimes framerate jumps to 180-200 fps. (Better than reverse, but kinda weird)
 		- Graphics don't adjust for the resolution
-			- Scroll area
+			- Scroll area @done(2021-06-23)
 			- Ingame Menu @done(2021-06-22)
 			- Main Menu
 	Misc:
diff --git a/isometric-park-fna/Engines/InputEngine.cs b/isometric-park-fna/Engines/InputEngine.cs
--- a/isometric-park-fna/Engines/InputEngine.cs
+++ b/isometric-park-fna/Engines/InputEngine.cs
@@ -31,23 +31,20 @@
 		private MouseState mousePrev;
 
 		private GraphicsDevice graphicsDevice;
+		private GraphicsDeviceManager gdm;
 		private Camera camera;
 
 		//Area to ignore:
 		private int menuBarHeight;
 		
-		private int viewWidth;
-		private int viewHeight;
-
-		public InputEngine(int menuBarHeight, int viewWidth, int viewHeight, Camera camera, 
-				GraphicsDevice graphicsDevice) {
+		public InputEngine(int menuBarHeight, Camera camera, 
+				GraphicsDeviceManager gdm) {
 			//initialize to blank for now
 			this.keyboardPrev = new KeyboardState();
 			this.menuBarHeight = menuBarHeight;
-			this.viewWidth = viewWidth;
-			this.viewHeight = viewHeight;
 			this.camera = camera;
-			this.graphicsDevice = graphicsDevice;
+			this.gdm = gdm;
+			this.graphicsDevice = gdm.GraphicsDevice;
 		}
 
 		public override void Update(double dt) {
@@ -59,6 +56,9 @@
 
 			bool isPlaying = false;
 
+			var viewWidth = gdm.PreferredBackBufferWidth;
+			var viewHeight = gdm.PreferredBackBufferHeight;
+
 			foreach (var entity in ReadEntities<GameStateComponent>())
 			{
 				var state = GetComponent<GameStateComponent>(entity).isPlaying;
@@ -205,7 +205,7 @@
 		{
 			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, -4)});
 		}
-		else if (MathUtils.BetweenExclusive(mouseCur.Y, (this.viewHeight - 50 -menuBarHeight), this.viewHeight-menuBarHeight))
+		else if (MathUtils.BetweenExclusive(mouseCur.Y, (viewHeight - 50 -menuBarHeight), viewHeight-menuBarHeight))
 		{
 			SendMessage(new MoveCameraMessage {Movement = new Vector2(0, 4)});
 		}
@@ -213,7 +213,7 @@
 		{
 			SendMessage(new MoveCameraMessage {Movement = new Vector2(-4, 0)});
 		}
-		else if (MathUtils.BetweenExclusive(mouseCur.X, (this.viewWidth - 50), this.viewWidth))
+		else if (MathUtils.BetweenExclusive(mouseCur.X, (viewWidth - 50), viewWidth))
 		{
 			SendMessage(new MoveCameraMessage {Movement = new Vector2(4, 0)});
 		}
diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs
--- a/isometric-park-fna/FNAGame.cs
+++ b/isometric-park-fna/FNAGame.cs
@@ -225,7 +225,7 @@
         this.grammar = new TraceryNet.Grammar(json2);
 
 
-        WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height, this.camera, GraphicsDevice));
+        WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
         WorldBuilder.AddEngine(new UIEngine());
 
         WorldBuilder.AddEngine(new GameBridgeEngine(this));
diff --git a/isometric-park-fna/UI/InGameMenu.cs b/isometric-park-fna/UI/InGameMenu.cs
--- a/isometric-park-fna/UI/InGameMenu.cs
+++ b/isometric-park-fna/UI/InGameMenu.cs
@@ -31,8 +31,6 @@
             // ImGui.PushFont(smallFont);
 	    ImGui.Begin("##In-game Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar);
 
-	    ImGui.Text("In-game menu");
-
 	    if (ImGui.Button("Options", button_size))
 	    {
 		    bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Options});