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

Fix login overlay behavior

Browse Source
This commit is contained in:
Joehu
2019-03-27 22:01:06 -07:00
parent fc59e6dec5
commit 53f3dacdfb
5 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Toolbar
public Action OnHome;
private ToolbarUserArea userArea;
private ToolbarUserButton userButton;
protected override bool BlockPositionalInput => false;
@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Toolbar
//{
// Icon = FontAwesome.fa_search
//},
userArea = new ToolbarUserArea(),
userButton = new ToolbarUserButton(),
new ToolbarNotificationButton(),
}
}
@ -143,7 +143,7 @@ namespace osu.Game.Overlays.Toolbar
protected override void PopOut()
{
userArea?.LoginOverlay.Hide();
userButton?.StateContainer.Hide();
this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
this.FadeOut(transition_time);

42
osu.Game/Overlays/Toolbar/ToolbarUserArea.cs
View File

@ -1,42 +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 osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osuTK;
using RectangleF = osu.Framework.Graphics.Primitives.RectangleF;
namespace osu.Game.Overlays.Toolbar
{
public class ToolbarUserArea : Container
{
public LoginOverlay LoginOverlay;
private ToolbarUserButton button;
public override RectangleF BoundingBox => button.BoundingBox;
[BackgroundDependencyLoader]
private void load()
{
RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;
Children = new Drawable[]
{
button = new ToolbarUserButton
{
Action = () => LoginOverlay.ToggleVisibility(),
},
LoginOverlay = new LoginOverlay
{
BypassAutoSizeAxes = Axes.Both,
Position = new Vector2(0, 1),
RelativePositionAxes = Axes.Y,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}
};
}
}
}

8
osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
View File

@ -13,7 +13,7 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.Toolbar
{
public class ToolbarUserButton : ToolbarButton, IOnlineComponent
public class ToolbarUserButton : ToolbarOverlayToggleButton, IOnlineComponent
{
private readonly UpdateableAvatar avatar;
@ -42,10 +42,12 @@ namespace osu.Game.Overlays.Toolbar
});
}
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
[BackgroundDependencyLoader(true)]
private void load(IAPIProvider api, LoginOverlay login)
{
api.Register(this);
StateContainer = login;
}
public void APIStateChanged(IAPIProvider api, APIState state)