# HG changeset patch # User alys # Date 2021-02-14 07:59:11 # Node ID 27def80fdef30ba57d999dfab0e101ecfcd77bb5 # Parent 88a5159af5e31a34a68bf5cf85ad2bac485e2fe1 Fix scrolling. 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 @@ -397,15 +397,12 @@ #endif #endregion gamerate_keys - #if DEBUG - Console.Out.WriteLine(String.Format("Rate: {0}", this.simulation.currentRate)); - #endif - - MouseState mouseCur = Mouse.GetState(); this.original_point = Vector2.Transform(new Vector2(mouseCur.X, mouseCur.Y), Matrix.Invert(camera.get_transformation(GraphicsDevice))); + int menuBarHeight = 20; + if (MathUtils.Between(mouseCur.X, 0, 50)) { this.camera.Move(new Vector2(-4, 0)); @@ -415,11 +412,11 @@ this.camera.Move(new Vector2(4, 0)); } - if (MathUtils.Between(mouseCur.Y, 0, 50)) + if (MathUtils.Between(mouseCur.Y, menuBarHeight, 50 + menuBarHeight)) { this.camera.Move(new Vector2(0, -4)); } - else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50), FNAGame.height)) + else if (MathUtils.Between(mouseCur.Y, (FNAGame.height - 50 -menuBarHeight), FNAGame.height-menuBarHeight)) { this.camera.Move(new Vector2(0, 4)); } @@ -843,6 +840,7 @@ additionalInfo.Add("mouse delta", delta.ToString()); additionalInfo.Add("Tracery Test", this.output); + debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window); diff --git a/isometric-park-fna/UI/Menu.cs b/isometric-park-fna/UI/Menu.cs --- a/isometric-park-fna/UI/Menu.cs +++ b/isometric-park-fna/UI/Menu.cs @@ -54,7 +54,7 @@ ImGui.SetCursorPosX(width - 350); - if (Menu.activeButton("&Budget", show_budget, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) + if (Menu.activeButton("Budget", show_budget, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f))) { show_budget = !show_budget;