h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 01:33:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4549 from Joehuu/fix-login-overlay-behavior

Browse Source 
Fix login overlay blocking toolbar input

Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Dean Herbert 2019-03-29 15:17:27 +09:00 committed by GitHub
commit b8580cde6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/OsuGame.cs
View File

@ -62,6 +62,8 @@ namespace osu.Game
private NotificationOverlay notifications;
private LoginOverlay loginOverlay;
private DialogOverlay dialogOverlay;
private AccountCreationOverlay accountCreation;
@ -422,6 +424,13 @@ namespace osu.Game
loadComponentSingleFile(volume = new VolumeOverlay(), floatingOverlayContent.Add);
loadComponentSingleFile(onscreenDisplay = new OnScreenDisplay(), Add);
loadComponentSingleFile(loginOverlay = new LoginOverlay
{
GetToolbarHeight = () => ToolbarOffset,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}, floatingOverlayContent.Add);
loadComponentSingleFile(screenshotManager, Add);
//overlay elements
@ -432,6 +441,7 @@ namespace osu.Game
loadComponentSingleFile(settings = new MainSettings { GetToolbarHeight = () => ToolbarOffset }, floatingOverlayContent.Add);
loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add);
loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add);
loadComponentSingleFile(notifications = new NotificationOverlay
{
GetToolbarHeight = () => ToolbarOffset,
@ -463,6 +473,7 @@ namespace osu.Game
dependencies.Cache(musicController);
dependencies.Cache(beatmapSetOverlay);
dependencies.Cache(notifications);
dependencies.Cache(loginOverlay);
dependencies.Cache(dialogOverlay);
dependencies.Cache(accountCreation);

13
osu.Game/Overlays/LoginOverlay.cs
View File

@ -10,6 +10,7 @@ using osuTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using System;
namespace osu.Game.Overlays
{
@ -19,6 +20,11 @@ namespace osu.Game.Overlays
private const float transition_time = 400;
/// <summary>
/// Provide a source for the toolbar height.
/// </summary>
public Func<float> GetToolbarHeight;
public LoginOverlay()
{
AutoSizeAxes = Axes.Both;
@ -88,5 +94,12 @@ namespace osu.Game.Overlays
settingsSection.Bounding = false;
this.FadeOut(transition_time);
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
Padding = new MarginPadding { Top = GetToolbarHeight?.Invoke() ?? 0 };
}
}
}

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.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)