align all key bindings input screens

This commit is contained in:
UnknownShadow200 2017-03-01 12:46:24 +11:00
parent 5aaa26bf00
commit d5f893c8be
5 changed files with 7 additions and 11 deletions

View File

@ -53,10 +53,6 @@ namespace ClassicalSharp.Gui.Screens {
return MakeBack(200, toGame ? "Back to game" : "Back to menu", 25, font, onClick); return MakeBack(200, toGame ? "Back to game" : "Back to menu", 25, font, onClick);
} }
protected ButtonWidget MakeBack(string text, int y, Font font, Action<Game, Widget> onClick) {
return MakeBack(200, text, y, font, onClick);
}
protected ButtonWidget MakeBack(int width, string text, int y, Font font, Action<Game, Widget> onClick) { protected ButtonWidget MakeBack(int width, string text, int y, Font font, Action<Game, Widget> onClick) {
return ButtonWidget.Create(game, width, text, font, LeftOnly(onClick)) return ButtonWidget.Create(game, width, text, font, LeftOnly(onClick))
.SetLocation(Anchor.Centre, Anchor.BottomOrRight, 0, y); .SetLocation(Anchor.Centre, Anchor.BottomOrRight, 0, y);

View File

@ -64,7 +64,7 @@ namespace ClassicalSharp.Gui.Screens {
LeftOnly((g, w) => g.Gui.SetNewScreen(new ClassicKeyBindingsScreen(g)))) LeftOnly((g, w) => g.Gui.SetNewScreen(new ClassicKeyBindingsScreen(g))))
.SetLocation(Anchor.Centre, Anchor.BottomOrRight, 0, 95), .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, null, null,
}; };
} }

View File

@ -54,7 +54,7 @@ namespace ClassicalSharp.Gui.Screens {
widgets[index++] = MakeBack(false, titleFont, widgets[index++] = MakeBack(false, titleFont,
(g, w) => g.Gui.SetNewScreen(new ClassicOptionsScreen(g))); (g, w) => g.Gui.SetNewScreen(new ClassicOptionsScreen(g)));
} else { } else {
widgets[index++] = MakeBack("Back to menu", 5, titleFont, widgets[index++] = MakeBack(false, titleFont,
(g, w) => g.Gui.SetNewScreen(new OptionsGroupScreen(g))); (g, w) => g.Gui.SetNewScreen(new OptionsGroupScreen(g)));
} }
} }

View File

@ -57,7 +57,7 @@ namespace ClassicalSharp.Gui.Screens {
protected override void ContextRecreated() { protected override void ContextRecreated() {
widgets = new Widget[left.Length + right.Length + 4]; widgets = new Widget[left.Length + right.Length + 4];
MakeWidgets(-95); MakeWidgets(-90);
} }
} }
@ -110,7 +110,7 @@ namespace ClassicalSharp.Gui.Screens {
protected override void ContextRecreated() { protected override void ContextRecreated() {
widgets = new Widget[left.Length + right.Length + 4]; widgets = new Widget[left.Length + right.Length + 4];
MakeWidgets(-50); MakeWidgets(-40);
} }
} }
@ -135,7 +135,7 @@ namespace ClassicalSharp.Gui.Screens {
protected override void ContextRecreated() { protected override void ContextRecreated() {
widgets = new Widget[left.Length + right.Length + 4]; widgets = new Widget[left.Length + right.Length + 4];
MakeWidgets(-50); MakeWidgets(-40);
} }
} }
@ -156,7 +156,7 @@ namespace ClassicalSharp.Gui.Screens {
protected override void ContextRecreated() { protected override void ContextRecreated() {
widgets = new Widget[left.Length + 5]; widgets = new Widget[left.Length + 5];
MakeWidgets(-50); MakeWidgets(-40);
widgets[index++] = TextWidget.Create(game, "&eRight click to remove the key binding", regularFont) widgets[index++] = TextWidget.Create(game, "&eRight click to remove the key binding", regularFont)
.SetLocation(Anchor.Centre, Anchor.Centre, 0, 100); .SetLocation(Anchor.Centre, Anchor.Centre, 0, 100);

View File

@ -68,7 +68,7 @@ namespace ClassicalSharp.Gui.Screens {
MakeClassic(0, 50, "Save level", MakeClassic(0, 50, "Save level",
(g, w) => g.Gui.SetNewScreen(new SaveLevelScreen(g))), (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 : game.ClassicMode ? null :
MakeClassic(0, 150, "Nostalgia options", MakeClassic(0, 150, "Nostalgia options",