sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into user-status-wiring

Browse Source
This commit is contained in:
Lucas A
2019-05-07 18:27:14 +02:00
parent 3ecfa9dcdb 9f52b3b490
commit a5f758b977
224 changed files with 772 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -88,6 +88,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
}
};
break;
case APIState.Failing:
case APIState.Connecting:
LinkFlowContainer linkFlow;
@ -113,6 +114,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
linkFlow.AddLink("cancel", api.Logout, string.Empty);
break;
case APIState.Online:
Children = new Drawable[]
{
@ -162,14 +164,17 @@ namespace osu.Game.Overlays.Settings.Sections.General
api.LocalUser.Value.Status.Value = new UserStatusOnline();
dropdown.StatusColour = colours.Green;
break;
case UserAction.DoNotDisturb:
api.LocalUser.Value.Status.Value = new UserStatusDoNotDisturb();
dropdown.StatusColour = colours.Red;
break;
case UserAction.AppearOffline:
api.LocalUser.Value.Status.Value = new UserStatusOffline();
dropdown.StatusColour = colours.Gray7;
break;
case UserAction.SignOut:
api.Logout();
break;

1
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -65,6 +65,7 @@ namespace osu.Game.Overlays.Settings
{
bindable = value;
controlWithCurrent?.Current.BindTo(bindable);
if (ShowsDefaultIndicator)
{
restoreDefaultButton.Bindable = bindable.GetBoundCopy();

1
osu.Game/Overlays/Settings/Sidebar.cs
View File

@ -102,6 +102,7 @@ namespace osu.Game.Overlays.Settings
default:
this.ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, Easing.OutQuint);
break;
case ExpandedState.Expanded:
this.ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, Easing.OutQuint);
break;

1
osu.Game/Overlays/Settings/SidebarButton.cs
View File

@ -46,6 +46,7 @@ namespace osu.Game.Overlays.Settings
set
{
selected = value;
if (selected)
{
selectionIndicator.FadeIn(50);