1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-12 23:12:59 +08:00

expand and contract settings from hover

This commit is contained in:
Sheppsu 2024-11-23 01:09:58 -05:00
parent 7d4062d2ad
commit 3713bb48b7

View File

@ -1,37 +1,34 @@
// 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.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Play.HUD;
using osuTK;
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
{
public partial class MultiSpectatorSettings : CompositeDrawable
public partial class MultiSpectatorSettings : ExpandingContainer
{
private const double slide_duration = 200;
private readonly PlayerSettingsOverlay playerSettingsOverlay;
private readonly Container slidingContainer;
private readonly BindableBool opened = new BindableBool();
public const float CONTRACTED_WIDTH = 30;
public const int EXPANDED_WIDTH = 300;
public MultiSpectatorSettings()
: base(CONTRACTED_WIDTH, EXPANDED_WIDTH)
{
Origin = Anchor.TopLeft;
Origin = Anchor.TopRight;
Anchor = Anchor.TopRight;
AutoSizeAxes = Axes.Both;
InternalChildren = new Drawable[]
{
slidingContainer = new Container
PlayerSettingsOverlay playerSettingsOverlay;
InternalChild = new FillFlowContainer
{
Origin = Anchor.TopLeft,
Anchor = Anchor.TopLeft,
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
@ -40,41 +37,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
Icon = FontAwesome.Solid.Cog,
Origin = Anchor.TopLeft,
Anchor = Anchor.TopLeft,
Position = new Vector2(-30, 0),
Action = () => opened.Toggle()
Action = () => Expanded.Toggle()
},
playerSettingsOverlay = new PlayerSettingsOverlay()
playerSettingsOverlay = new PlayerSettingsOverlay
{
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft
}
}
};
playerSettingsOverlay.Show();
opened.BindValueChanged(value =>
{
if (value.NewValue)
open();
else
close();
});
}
private void open()
protected override void OnHoverLost(HoverLostEvent e)
{
slidingContainer.MoveToOffset(new Vector2(-playerSettingsOverlay.Width, 0), slide_duration, Easing.Out).Then().OnComplete(c =>
{
c.Origin = Anchor.TopRight;
c.Position = Vector2.Zero;
});
}
private void close()
{
slidingContainer.MoveToOffset(new Vector2(playerSettingsOverlay.Width, 0), slide_duration, Easing.Out).Then().OnComplete(c =>
{
c.Origin = Anchor.TopLeft;
c.Position = Vector2.Zero;
});
// Prevent unexpanding when hovering player settings
if (!Contains(e.ScreenSpaceMousePosition))
base.OnHoverLost(e);
}
}
}