From d5f893c8be9692bf5f940cf778f919932082e421 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 1 Mar 2017 12:46:24 +1100 Subject: [PATCH] align all key bindings input screens --- ClassicalSharp/2D/Screens/ClickableScreen.cs | 4 ---- ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs | 2 +- ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs | 2 +- ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs | 8 ++++---- ClassicalSharp/2D/Screens/Menu/PauseScreen.cs | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ClassicalSharp/2D/Screens/ClickableScreen.cs b/ClassicalSharp/2D/Screens/ClickableScreen.cs index 24f6af70c..d99e68f1b 100644 --- a/ClassicalSharp/2D/Screens/ClickableScreen.cs +++ b/ClassicalSharp/2D/Screens/ClickableScreen.cs @@ -53,10 +53,6 @@ namespace ClassicalSharp.Gui.Screens { return MakeBack(200, toGame ? "Back to game" : "Back to menu", 25, font, onClick); } - protected ButtonWidget MakeBack(string text, int y, Font font, Action onClick) { - return MakeBack(200, text, y, font, onClick); - } - protected ButtonWidget MakeBack(int width, string text, int y, Font font, Action onClick) { return ButtonWidget.Create(game, width, text, font, LeftOnly(onClick)) .SetLocation(Anchor.Centre, Anchor.BottomOrRight, 0, y); diff --git a/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs index 04250755a..ea8171567 100644 --- a/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs @@ -64,7 +64,7 @@ namespace ClassicalSharp.Gui.Screens { LeftOnly((g, w) => g.Gui.SetNewScreen(new ClassicKeyBindingsScreen(g)))) .SetLocation(Anchor.Centre, Anchor.BottomOrRight, 0, 95), - MakeBack(400, "Done", 22, titleFont, (g, w) => g.Gui.SetNewScreen(new PauseScreen(g))), + MakeBack(400, "Done", 25, titleFont, (g, w) => g.Gui.SetNewScreen(new PauseScreen(g))), null, null, }; } diff --git a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs index c4f6b9c2f..fc43daaaf 100644 --- a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs @@ -54,7 +54,7 @@ namespace ClassicalSharp.Gui.Screens { widgets[index++] = MakeBack(false, titleFont, (g, w) => g.Gui.SetNewScreen(new ClassicOptionsScreen(g))); } else { - widgets[index++] = MakeBack("Back to menu", 5, titleFont, + widgets[index++] = MakeBack(false, titleFont, (g, w) => g.Gui.SetNewScreen(new OptionsGroupScreen(g))); } } diff --git a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs index 8a42a3077..48750d202 100644 --- a/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs +++ b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs @@ -57,7 +57,7 @@ namespace ClassicalSharp.Gui.Screens { protected override void ContextRecreated() { widgets = new Widget[left.Length + right.Length + 4]; - MakeWidgets(-95); + MakeWidgets(-90); } } @@ -110,7 +110,7 @@ namespace ClassicalSharp.Gui.Screens { protected override void ContextRecreated() { widgets = new Widget[left.Length + right.Length + 4]; - MakeWidgets(-50); + MakeWidgets(-40); } } @@ -135,7 +135,7 @@ namespace ClassicalSharp.Gui.Screens { protected override void ContextRecreated() { widgets = new Widget[left.Length + right.Length + 4]; - MakeWidgets(-50); + MakeWidgets(-40); } } @@ -156,7 +156,7 @@ namespace ClassicalSharp.Gui.Screens { protected override void ContextRecreated() { widgets = new Widget[left.Length + 5]; - MakeWidgets(-50); + MakeWidgets(-40); widgets[index++] = TextWidget.Create(game, "&eRight click to remove the key binding", regularFont) .SetLocation(Anchor.Centre, Anchor.Centre, 0, 100); diff --git a/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs b/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs index bf846bf8a..1108e4763 100644 --- a/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs +++ b/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs @@ -68,7 +68,7 @@ namespace ClassicalSharp.Gui.Screens { MakeClassic(0, 50, "Save level", (g, w) => g.Gui.SetNewScreen(new SaveLevelScreen(g))), - MakeBack(400, "Back to game", 22, titleFont, (g, w) => g.Gui.SetNewScreen(null)), + MakeBack(400, "Back to game", 25, titleFont, (g, w) => g.Gui.SetNewScreen(null)), game.ClassicMode ? null : MakeClassic(0, 150, "Nostalgia options",