Merge branch 'master' into fix-taiko-fl

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -424,14 +424,14 @@ namespace osu.Game.Tests.Beatmaps.IO
                     checkBeatmapCount(osu, 12);
                     checkSingleReferencedFileCount(osu, 18);
 
-                    var breakTemp = TestResources.GetTestBeatmapForImport();
+                    var brokenTempFilename = TestResources.GetTestBeatmapForImport();
 
                     MemoryStream brokenOsu = new MemoryStream();
-                    MemoryStream brokenOsz = new MemoryStream(await File.ReadAllBytesAsync(breakTemp));
+                    MemoryStream brokenOsz = new MemoryStream(await File.ReadAllBytesAsync(brokenTempFilename));
 
-                    File.Delete(breakTemp);
+                    File.Delete(brokenTempFilename);
 
-                    using (var outStream = File.Open(breakTemp, FileMode.CreateNew))
+                    using (var outStream = File.Open(brokenTempFilename, FileMode.CreateNew))
                     using (var zip = ZipArchive.Open(brokenOsz))
                     {
                         zip.AddEntry("broken.osu", brokenOsu, false);
@@ -441,7 +441,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                     // this will trigger purging of the existing beatmap (online set id match) but should rollback due to broken osu.
                     try
                     {
-                        await manager.Import(new ImportTask(breakTemp));
+                        await manager.Import(new ImportTask(brokenTempFilename));
                     }
                     catch
                     {
@@ -456,6 +456,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                     checkSingleReferencedFileCount(osu, 18);
 
                     Assert.AreEqual(1, loggedExceptionCount);
+
+                    File.Delete(brokenTempFilename);
                 }
                 finally
                 {

osu.Game.Tests/Resources/TestResources.cs

@@ -1,9 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.IO;
 using NUnit.Framework;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 
 namespace osu.Game.Tests.Resources
 {
@@ -11,6 +13,8 @@ namespace osu.Game.Tests.Resources
     {
         public const double QUICK_BEATMAP_LENGTH = 10000;
 
+        private static readonly TemporaryNativeStorage temp_storage = new TemporaryNativeStorage("TestResources");
+
         public static DllResourceStore GetStore() => new DllResourceStore(typeof(TestResources).Assembly);
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
@@ -25,7 +29,7 @@ namespace osu.Game.Tests.Resources
         /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
         public static string GetQuickTestBeatmapForImport()
         {
-            var tempPath = Path.GetTempFileName() + ".osz";
+            var tempPath = getTempFilename();
             using (var stream = OpenResource("Archives/241526 Soleily - Renatus_virtual_quick.osz"))
             using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
@@ -41,7 +45,7 @@ namespace osu.Game.Tests.Resources
         /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
         public static string GetTestBeatmapForImport(bool virtualTrack = false)
         {
-            var tempPath = Path.GetTempFileName() + ".osz";
+            var tempPath = getTempFilename();
 
             using (var stream = GetTestBeatmapStream(virtualTrack))
             using (var newFile = File.Create(tempPath))
@@ -50,5 +54,7 @@ namespace osu.Game.Tests.Resources
             Assert.IsTrue(File.Exists(tempPath));
             return tempPath;
         }
+
+        private static string getTempFilename() => temp_storage.GetFullPath(Guid.NewGuid() + ".osz");
     }
 }

osu.Game.Tests/Visual/Menus/TestSceneLoginPanel.cs

@@ -0,0 +1,41 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Login;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+    [TestFixture]
+    public class TestSceneLoginPanel : OsuManualInputManagerTestScene
+    {
+        private LoginPanel loginPanel;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create login dialog", () =>
+            {
+                Add(loginPanel = new LoginPanel
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.5f,
+                });
+            });
+        }
+
+        [Test]
+        public void TestBasicLogin()
+        {
+            AddStep("logout", () => API.Logout());
+
+            AddStep("enter password", () => loginPanel.ChildrenOfType<OsuPasswordTextBox>().First().Text = "password");
+            AddStep("submit", () => loginPanel.ChildrenOfType<OsuButton>().First(b => b.Text.ToString() == "Sign in").TriggerClick());
+        }
+    }
+}

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerLoungeSubScreen.cs

@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestJoinRoomWithIncorrectPassword()
+        public void TestJoinRoomWithIncorrectPasswordViaButton()
         {
             DrawableLoungeRoom.PasswordEntryPopover passwordEntryPopover = null;
 
@@ -96,6 +96,24 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddAssert("room not joined", () => loungeScreen.IsCurrentScreen());
             AddUntilStep("password prompt still visible", () => passwordEntryPopover.State.Value == Visibility.Visible);
+            AddAssert("textbox still focused", () => InputManager.FocusedDrawable is OsuPasswordTextBox);
+        }
+
+        [Test]
+        public void TestJoinRoomWithIncorrectPasswordViaEnter()
+        {
+            DrawableLoungeRoom.PasswordEntryPopover passwordEntryPopover = null;
+
+            AddStep("add room", () => RoomManager.AddRooms(1, withPassword: true));
+            AddStep("select room", () => InputManager.Key(Key.Down));
+            AddStep("attempt join room", () => InputManager.Key(Key.Enter));
+            AddUntilStep("password prompt appeared", () => (passwordEntryPopover = InputManager.ChildrenOfType<DrawableLoungeRoom.PasswordEntryPopover>().FirstOrDefault()) != null);
+            AddStep("enter password in text box", () => passwordEntryPopover.ChildrenOfType<TextBox>().First().Text = "wrong");
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            AddAssert("room not joined", () => loungeScreen.IsCurrentScreen());
+            AddUntilStep("password prompt still visible", () => passwordEntryPopover.State.Value == Visibility.Visible);
+            AddAssert("textbox still focused", () => InputManager.FocusedDrawable is OsuPasswordTextBox);
         }
 
         [Test]

osu.Game/Overlays/Login/LoginForm.cs

@@ -0,0 +1,108 @@
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Overlays.Settings;
+using osuTK;
+
+namespace osu.Game.Overlays.Login
+{
+    public class LoginForm : FillFlowContainer
+    {
+        private TextBox username;
+        private TextBox password;
+        private ShakeContainer shakeSignIn;
+
+        [Resolved(CanBeNull = true)]
+        private IAPIProvider api { get; set; }
+
+        public Action RequestHide;
+
+        private void performLogin()
+        {
+            if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
+                api?.Login(username.Text, password.Text);
+            else
+                shakeSignIn.Shake();
+        }
+
+        [BackgroundDependencyLoader(permitNulls: true)]
+        private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
+        {
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(0, 5);
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            Children = new Drawable[]
+            {
+                username = new OsuTextBox
+                {
+                    PlaceholderText = "username",
+                    RelativeSizeAxes = Axes.X,
+                    Text = api?.ProvidedUsername ?? string.Empty,
+                    TabbableContentContainer = this
+                },
+                password = new OsuPasswordTextBox
+                {
+                    PlaceholderText = "password",
+                    RelativeSizeAxes = Axes.X,
+                    TabbableContentContainer = this,
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Remember username",
+                    Current = config.GetBindable<bool>(OsuSetting.SaveUsername),
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Stay signed in",
+                    Current = config.GetBindable<bool>(OsuSetting.SavePassword),
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        shakeSignIn = new ShakeContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Child = new SettingsButton
+                            {
+                                Text = "Sign in",
+                                Action = performLogin
+                            },
+                        }
+                    }
+                },
+                new SettingsButton
+                {
+                    Text = "Register",
+                    Action = () =>
+                    {
+                        RequestHide();
+                        accountCreation.Show();
+                    }
+                }
+            };
+
+            password.OnCommit += (sender, newText) => performLogin();
+        }
+
+        public override bool AcceptsFocus => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            Schedule(() => { GetContainingInputManager().ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
+        }
+    }
+}

osu.Game/Overlays/Login/LoginPanel.cs

@@ -0,0 +1,199 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Users;
+using osuTK;
+using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
+using Container = osu.Framework.Graphics.Containers.Container;
+
+namespace osu.Game.Overlays.Login
+{
+    public class LoginPanel : FillFlowContainer
+    {
+        private bool bounding = true;
+        private LoginForm form;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private UserGridPanel panel;
+        private UserDropdown dropdown;
+
+        /// <summary>
+        /// Called to request a hide of a parent displaying this container.
+        /// </summary>
+        public Action RequestHide;
+
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
+
+        public bool Bounding
+        {
+            get => bounding;
+            set
+            {
+                bounding = value;
+                Invalidate(Invalidation.MiscGeometry);
+            }
+        }
+
+        public LoginPanel()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(0f, 5f);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+        }
+
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        {
+            form = null;
+
+            switch (state.NewValue)
+            {
+                case APIState.Offline:
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = "ACCOUNT",
+                            Margin = new MarginPadding { Bottom = 5 },
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        },
+                        form = new LoginForm
+                        {
+                            RequestHide = RequestHide
+                        }
+                    };
+                    break;
+
+                case APIState.Failing:
+                case APIState.Connecting:
+                    LinkFlowContainer linkFlow;
+
+                    Children = new Drawable[]
+                    {
+                        new LoadingSpinner
+                        {
+                            State = { Value = Visibility.Visible },
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                        },
+                        linkFlow = new LinkFlowContainer
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            TextAnchor = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
+                            Text = state.NewValue == APIState.Failing ? "Connection is failing, will attempt to reconnect... " : "Attempting to connect... ",
+                            Margin = new MarginPadding { Top = 10, Bottom = 10 },
+                        },
+                    };
+
+                    linkFlow.AddLink("cancel", api.Logout, string.Empty);
+                    break;
+
+                case APIState.Online:
+                    Children = new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Left = 20, Right = 20 },
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(0f, 10f),
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Text = "Signed in",
+                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
+                                            Margin = new MarginPadding { Top = 5, Bottom = 5 },
+                                        },
+                                    },
+                                },
+                                panel = new UserGridPanel(api.LocalUser.Value)
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Action = RequestHide
+                                },
+                                dropdown = new UserDropdown { RelativeSizeAxes = Axes.X },
+                            },
+                        },
+                    };
+
+                    panel.Status.BindTo(api.LocalUser.Value.Status);
+                    panel.Activity.BindTo(api.LocalUser.Value.Activity);
+
+                    dropdown.Current.BindValueChanged(action =>
+                    {
+                        switch (action.NewValue)
+                        {
+                            case UserAction.Online:
+                                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;
+                        }
+                    }, true);
+                    break;
+            }
+
+            if (form != null) GetContainingInputManager()?.ChangeFocus(form);
+        });
+
+        public override bool AcceptsFocus => true;
+
+        protected override bool OnClick(ClickEvent e) => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            if (form != null) GetContainingInputManager().ChangeFocus(form);
+            base.OnFocus(e);
+        }
+    }
+}

osu.Game/Overlays/Login/UserAction.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel;
+
+namespace osu.Game.Overlays.Login
+{
+    public enum UserAction
+    {
+        Online,
+
+        [Description(@"Do not disturb")]
+        DoNotDisturb,
+
+        [Description(@"Appear offline")]
+        AppearOffline,
+
+        [Description(@"Sign out")]
+        SignOut,
+    }
+}

osu.Game/Overlays/Login/UserDropdown.cs

@@ -0,0 +1,121 @@
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Login
+{
+    public class UserDropdown : OsuEnumDropdown<UserAction>
+    {
+        protected override DropdownHeader CreateHeader() => new UserDropdownHeader();
+
+        protected override DropdownMenu CreateMenu() => new UserDropdownMenu();
+
+        public Color4 StatusColour
+        {
+            set
+            {
+                if (Header is UserDropdownHeader h)
+                    h.StatusColour = value;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.Gray5;
+        }
+
+        protected class UserDropdownMenu : OsuDropdownMenu
+        {
+            public UserDropdownMenu()
+            {
+                Masking = true;
+                CornerRadius = 5;
+
+                Margin = new MarginPadding { Bottom = 5 };
+
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(0.25f),
+                    Radius = 4,
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Gray3;
+            }
+
+            protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
+
+            private class DrawableUserDropdownMenuItem : DrawableOsuDropdownMenuItem
+            {
+                public DrawableUserDropdownMenuItem(MenuItem item)
+                    : base(item)
+                {
+                    Foreground.Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 5 };
+                    CornerRadius = 5;
+                }
+
+                protected override Drawable CreateContent() => new Content
+                {
+                    Label = { Margin = new MarginPadding { Left = UserDropdownHeader.LABEL_LEFT_MARGIN - 11 } }
+                };
+            }
+        }
+
+        private class UserDropdownHeader : OsuDropdownHeader
+        {
+            public const float LABEL_LEFT_MARGIN = 20;
+
+            private readonly SpriteIcon statusIcon;
+
+            public Color4 StatusColour
+            {
+                set => statusIcon.FadeColour(value, 500, Easing.OutQuint);
+            }
+
+            public UserDropdownHeader()
+            {
+                Foreground.Padding = new MarginPadding { Left = 10, Right = 10 };
+                Margin = new MarginPadding { Bottom = 5 };
+                Masking = true;
+                CornerRadius = 5;
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Colour = Color4.Black.Opacity(0.25f),
+                    Radius = 4,
+                };
+
+                Icon.Size = new Vector2(14);
+                Icon.Margin = new MarginPadding(0);
+
+                Foreground.Add(statusIcon = new SpriteIcon
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Icon = FontAwesome.Regular.Circle,
+                    Size = new Vector2(14),
+                });
+
+                Text.Margin = new MarginPadding { Left = LABEL_LEFT_MARGIN };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Gray3;
+            }
+        }
+    }
+}

osu.Game/Overlays/LoginOverlay.cs

@@ -5,17 +5,17 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Overlays.Settings.Sections.General;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Overlays.Login;
 
 namespace osu.Game.Overlays
 {
     public class LoginOverlay : OsuFocusedOverlayContainer
     {
-        private LoginSettings settingsSection;
+        private LoginPanel panel;
 
         private const float transition_time = 400;
 
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays
                             AutoSizeEasing = Easing.OutQuint,
                             Children = new Drawable[]
                             {
-                                settingsSection = new LoginSettings
+                                panel = new LoginPanel
                                 {
                                     Padding = new MarginPadding(10),
                                     RequestHide = Hide,
@@ -75,17 +75,17 @@ namespace osu.Game.Overlays
         {
             base.PopIn();
 
-            settingsSection.Bounding = true;
+            panel.Bounding = true;
             this.FadeIn(transition_time, Easing.OutQuint);
 
-            GetContainingInputManager().ChangeFocus(settingsSection);
+            GetContainingInputManager().ChangeFocus(panel);
         }
 
         protected override void PopOut()
         {
             base.PopOut();
 
-            settingsSection.Bounding = false;
+            panel.Bounding = false;
             this.FadeOut(transition_time);
         }
     }

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -1,421 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Configuration;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osuTK;
-using osu.Game.Users;
-using System.ComponentModel;
-using osu.Framework.Bindables;
-using osu.Game.Graphics;
-using osuTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.Containers;
-using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
-using Container = osu.Framework.Graphics.Containers.Container;
-
-namespace osu.Game.Overlays.Settings.Sections.General
-{
-    public class LoginSettings : FillFlowContainer
-    {
-        private bool bounding = true;
-        private LoginForm form;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private UserGridPanel panel;
-        private UserDropdown dropdown;
-
-        /// <summary>
-        /// Called to request a hide of a parent displaying this container.
-        /// </summary>
-        public Action RequestHide;
-
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        public override RectangleF BoundingBox => bounding ? base.BoundingBox : RectangleF.Empty;
-
-        public bool Bounding
-        {
-            get => bounding;
-            set
-            {
-                bounding = value;
-                Invalidate(Invalidation.MiscGeometry);
-            }
-        }
-
-        public LoginSettings()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(0f, 5f);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(onlineStateChanged, true);
-        }
-
-        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
-        {
-            form = null;
-
-            switch (state.NewValue)
-            {
-                case APIState.Offline:
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Text = "ACCOUNT",
-                            Margin = new MarginPadding { Bottom = 5 },
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        },
-                        form = new LoginForm
-                        {
-                            RequestHide = RequestHide
-                        }
-                    };
-                    break;
-
-                case APIState.Failing:
-                case APIState.Connecting:
-                    LinkFlowContainer linkFlow;
-
-                    Children = new Drawable[]
-                    {
-                        new LoadingSpinner
-                        {
-                            State = { Value = Visibility.Visible },
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                        },
-                        linkFlow = new LinkFlowContainer
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            TextAnchor = Anchor.TopCentre,
-                            AutoSizeAxes = Axes.Both,
-                            Text = state.NewValue == APIState.Failing ? "Connection is failing, will attempt to reconnect... " : "Attempting to connect... ",
-                            Margin = new MarginPadding { Top = 10, Bottom = 10 },
-                        },
-                    };
-
-                    linkFlow.AddLink("cancel", api.Logout, string.Empty);
-                    break;
-
-                case APIState.Online:
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding { Left = 20, Right = 20 },
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0f, 10f),
-                            Children = new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Children = new[]
-                                    {
-                                        new OsuSpriteText
-                                        {
-                                            Anchor = Anchor.Centre,
-                                            Origin = Anchor.Centre,
-                                            Text = "Signed in",
-                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold),
-                                            Margin = new MarginPadding { Top = 5, Bottom = 5 },
-                                        },
-                                    },
-                                },
-                                panel = new UserGridPanel(api.LocalUser.Value)
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Action = RequestHide
-                                },
-                                dropdown = new UserDropdown { RelativeSizeAxes = Axes.X },
-                            },
-                        },
-                    };
-
-                    panel.Status.BindTo(api.LocalUser.Value.Status);
-                    panel.Activity.BindTo(api.LocalUser.Value.Activity);
-
-                    dropdown.Current.BindValueChanged(action =>
-                    {
-                        switch (action.NewValue)
-                        {
-                            case UserAction.Online:
-                                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;
-                        }
-                    }, true);
-                    break;
-            }
-
-            if (form != null) GetContainingInputManager()?.ChangeFocus(form);
-        });
-
-        public override bool AcceptsFocus => true;
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        protected override void OnFocus(FocusEvent e)
-        {
-            if (form != null) GetContainingInputManager().ChangeFocus(form);
-            base.OnFocus(e);
-        }
-
-        private class LoginForm : FillFlowContainer
-        {
-            private TextBox username;
-            private TextBox password;
-            private ShakeContainer shakeSignIn;
-
-            [Resolved(CanBeNull = true)]
-            private IAPIProvider api { get; set; }
-
-            public Action RequestHide;
-
-            private void performLogin()
-            {
-                if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
-                    api?.Login(username.Text, password.Text);
-                else
-                    shakeSignIn.Shake();
-            }
-
-            [BackgroundDependencyLoader(permitNulls: true)]
-            private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
-            {
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(0, 5);
-                AutoSizeAxes = Axes.Y;
-                RelativeSizeAxes = Axes.X;
-                Children = new Drawable[]
-                {
-                    username = new OsuTextBox
-                    {
-                        PlaceholderText = "username",
-                        RelativeSizeAxes = Axes.X,
-                        Text = api?.ProvidedUsername ?? string.Empty,
-                        TabbableContentContainer = this
-                    },
-                    password = new OsuPasswordTextBox
-                    {
-                        PlaceholderText = "password",
-                        RelativeSizeAxes = Axes.X,
-                        TabbableContentContainer = this,
-                    },
-                    new SettingsCheckbox
-                    {
-                        LabelText = "Remember username",
-                        Current = config.GetBindable<bool>(OsuSetting.SaveUsername),
-                    },
-                    new SettingsCheckbox
-                    {
-                        LabelText = "Stay signed in",
-                        Current = config.GetBindable<bool>(OsuSetting.SavePassword),
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            shakeSignIn = new ShakeContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Child = new SettingsButton
-                                {
-                                    Text = "Sign in",
-                                    Action = performLogin
-                                },
-                            }
-                        }
-                    },
-                    new SettingsButton
-                    {
-                        Text = "Register",
-                        Action = () =>
-                        {
-                            RequestHide();
-                            accountCreation.Show();
-                        }
-                    }
-                };
-
-                password.OnCommit += (sender, newText) => performLogin();
-            }
-
-            public override bool AcceptsFocus => true;
-
-            protected override bool OnClick(ClickEvent e) => true;
-
-            protected override void OnFocus(FocusEvent e)
-            {
-                Schedule(() => { GetContainingInputManager().ChangeFocus(string.IsNullOrEmpty(username.Text) ? username : password); });
-            }
-        }
-
-        private class UserDropdown : OsuEnumDropdown<UserAction>
-        {
-            protected override DropdownHeader CreateHeader() => new UserDropdownHeader();
-
-            protected override DropdownMenu CreateMenu() => new UserDropdownMenu();
-
-            public Color4 StatusColour
-            {
-                set
-                {
-                    if (Header is UserDropdownHeader h)
-                        h.StatusColour = value;
-                }
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                AccentColour = colours.Gray5;
-            }
-
-            private class UserDropdownMenu : OsuDropdownMenu
-            {
-                public UserDropdownMenu()
-                {
-                    Masking = true;
-                    CornerRadius = 5;
-
-                    Margin = new MarginPadding { Bottom = 5 };
-
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Colour = Color4.Black.Opacity(0.25f),
-                        Radius = 4,
-                    };
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
-                {
-                    BackgroundColour = colours.Gray3;
-                }
-
-                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableUserDropdownMenuItem(item);
-
-                private class DrawableUserDropdownMenuItem : DrawableOsuDropdownMenuItem
-                {
-                    public DrawableUserDropdownMenuItem(MenuItem item)
-                        : base(item)
-                    {
-                        Foreground.Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 5 };
-                        CornerRadius = 5;
-                    }
-
-                    protected override Drawable CreateContent() => new Content
-                    {
-                        Label = { Margin = new MarginPadding { Left = UserDropdownHeader.LABEL_LEFT_MARGIN - 11 } }
-                    };
-                }
-            }
-
-            private class UserDropdownHeader : OsuDropdownHeader
-            {
-                public const float LABEL_LEFT_MARGIN = 20;
-
-                private readonly SpriteIcon statusIcon;
-
-                public Color4 StatusColour
-                {
-                    set => statusIcon.FadeColour(value, 500, Easing.OutQuint);
-                }
-
-                public UserDropdownHeader()
-                {
-                    Foreground.Padding = new MarginPadding { Left = 10, Right = 10 };
-                    Margin = new MarginPadding { Bottom = 5 };
-                    Masking = true;
-                    CornerRadius = 5;
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Colour = Color4.Black.Opacity(0.25f),
-                        Radius = 4,
-                    };
-
-                    Icon.Size = new Vector2(14);
-                    Icon.Margin = new MarginPadding(0);
-
-                    Foreground.Add(statusIcon = new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Regular.Circle,
-                        Size = new Vector2(14),
-                    });
-
-                    Text.Margin = new MarginPadding { Left = LABEL_LEFT_MARGIN };
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
-                {
-                    BackgroundColour = colours.Gray3;
-                }
-            }
-        }
-
-        private enum UserAction
-        {
-            Online,
-
-            [Description(@"Do not disturb")]
-            DoNotDisturb,
-
-            [Description(@"Appear offline")]
-            AppearOffline,
-
-            [Description(@"Sign out")]
-            SignOut,
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs

@@ -234,6 +234,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             {
                 passwordTextbox.Text = string.Empty;
 
+                GetContainingInputManager().ChangeFocus(passwordTextbox);
+
                 errorText.Text = error;
                 errorText
                     .FadeIn()

osu.Game/Screens/OsuScreenStack.cs

@@ -51,6 +51,6 @@ namespace osu.Game.Screens
         }
 
         private void setParallax(IScreen next) =>
-            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * ((IOsuScreen)next)?.BackgroundParallaxAmount ?? 1.0f;
+            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * (((IOsuScreen)next)?.BackgroundParallaxAmount ?? 1.0f);
     }
 }