h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 21:47:25 +08:00
Code Issues Releases Wiki Activity

Tidy up options login section code; fix incorrect flow logic for online state.

Browse Source
This commit is contained in:
Dean Herbert 2016-12-01 13:07:19 +09:00
parent 9d05c132e8
commit 13d26d0601
1 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game/Overlays/Options/General/LoginOptions.cs
View File

@ -14,26 +14,13 @@ namespace osu.Game.Overlays.Options.General
public class LoginOptions : OptionsSubsection, IOnlineComponent
{
private Container loginForm;
private APIAccess api;
protected override string Header => "Sign In";
public LoginOptions()
{
Children = new[]
{
loginForm = new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new[] { new LoadingAnimation() }
}
};
}
private Action performLogout;
protected override string Header => "Sign In";
[BackgroundDependencyLoader(permitNulls: true)]
private void load(APIAccess api)
{
this.api = api;
api?.Register(this);
}
@ -42,13 +29,13 @@ namespace osu.Game.Overlays.Options.General
switch (state)
{
case APIState.Offline:
loginForm.Children = new Drawable[]
Children = new Drawable[]
{
new LoginForm(api)
new LoginForm()
};
break;
case APIState.Failing:
loginForm.Children = new Drawable[]
Children = new Drawable[]
{
new SpriteText
{
@ -57,7 +44,7 @@ namespace osu.Game.Overlays.Options.General
};
break;
case APIState.Connecting:
loginForm.Children = new Drawable[]
Children = new Drawable[]
{
new SpriteText
{
@ -66,7 +53,7 @@ namespace osu.Game.Overlays.Options.General
};
break;
case APIState.Online:
loginForm.Children = new Drawable[]
Children = new Drawable[]
{
new SpriteText
{
@ -76,26 +63,20 @@ namespace osu.Game.Overlays.Options.General
{
RelativeSizeAxes = Axes.X,
Text = "Sign out",
Action = performLogout
Action = api.Logout
}
};
break;
}
}
private void performLogout()
{
api.Logout();
}
class LoginForm : FlowContainer
{
private APIAccess api;
private TextBox username;
private TextBox password;
private APIAccess api;
public LoginForm(APIAccess api)
public LoginForm()
{
Direction = FlowDirection.VerticalOnly;
AutoSizeAxes = Axes.Y;