mirror of
https://github.com/ppy/osu.git
synced 2025-03-18 03:27:20 +08:00
Remove HoverTarget
shared state update path
Felt quite convoluted to follow. Have just duplicated the single shared line instead.
This commit is contained in:
parent
ccc6d8ff40
commit
49b341daff
@ -2,7 +2,6 @@
|
||||
// See the LICENCE file in the repository root for full licence text.
|
||||
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Input.Events;
|
||||
using osu.Game.Graphics.UserInterface;
|
||||
|
||||
@ -10,13 +9,11 @@ namespace osu.Game.Overlays.Settings
|
||||
{
|
||||
public abstract class SidebarButton : OsuButton
|
||||
{
|
||||
private const double fade_duration = 50;
|
||||
protected const double FADE_DURATION = 500;
|
||||
|
||||
[Resolved]
|
||||
protected OverlayColourProvider ColourProvider { get; private set; }
|
||||
|
||||
protected abstract Drawable HoverTarget { get; }
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load()
|
||||
{
|
||||
@ -38,9 +35,6 @@ namespace osu.Game.Overlays.Settings
|
||||
|
||||
protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
|
||||
|
||||
protected virtual void UpdateState()
|
||||
{
|
||||
HoverTarget.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, fade_duration, Easing.OutQuint);
|
||||
}
|
||||
protected abstract void UpdateState();
|
||||
}
|
||||
}
|
||||
|
@ -15,17 +15,13 @@ namespace osu.Game.Overlays.Settings
|
||||
{
|
||||
public class SidebarIconButton : SidebarButton
|
||||
{
|
||||
private const double fade_duration = 500;
|
||||
|
||||
private const float selection_indicator_height_active = 18;
|
||||
private const float selection_indicator_height_inactive = 4;
|
||||
|
||||
private readonly ConstrainedIconContainer iconContainer;
|
||||
private readonly SpriteText headerText;
|
||||
private readonly CircularContainer selectionIndicator;
|
||||
private readonly Container text;
|
||||
|
||||
protected override Drawable HoverTarget => text;
|
||||
private readonly Container textIconContent;
|
||||
|
||||
// always consider as part of flow, even when not visible (for the sake of the initial animation).
|
||||
public override bool IsPresent => true;
|
||||
@ -64,7 +60,7 @@ namespace osu.Game.Overlays.Settings
|
||||
|
||||
AddRange(new Drawable[]
|
||||
{
|
||||
text = new Container
|
||||
textIconContent = new Container
|
||||
{
|
||||
Width = Sidebar.DEFAULT_WIDTH,
|
||||
RelativeSizeAxes = Axes.Y,
|
||||
@ -117,15 +113,18 @@ namespace osu.Game.Overlays.Settings
|
||||
{
|
||||
if (Selected)
|
||||
{
|
||||
text.FadeColour(ColourProvider.Content1, fade_duration, Easing.OutQuint);
|
||||
selectionIndicator.FadeIn(fade_duration, Easing.OutQuint);
|
||||
selectionIndicator.ResizeHeightTo(selection_indicator_height_active, fade_duration, Easing.OutElasticHalf);
|
||||
return;
|
||||
}
|
||||
textIconContent.FadeColour(ColourProvider.Content1, FADE_DURATION, Easing.OutQuint);
|
||||
|
||||
selectionIndicator.FadeOut(fade_duration, Easing.OutQuint);
|
||||
selectionIndicator.ResizeHeightTo(selection_indicator_height_inactive, fade_duration, Easing.OutQuint);
|
||||
base.UpdateState();
|
||||
selectionIndicator.FadeIn(FADE_DURATION, Easing.OutQuint);
|
||||
selectionIndicator.ResizeHeightTo(selection_indicator_height_active, FADE_DURATION, Easing.OutElasticHalf);
|
||||
}
|
||||
else
|
||||
{
|
||||
textIconContent.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
|
||||
|
||||
selectionIndicator.FadeOut(FADE_DURATION, Easing.OutQuint);
|
||||
selectionIndicator.ResizeHeightTo(selection_indicator_height_inactive, FADE_DURATION, Easing.OutQuint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -36,8 +36,6 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
private Container content;
|
||||
|
||||
protected override Drawable HoverTarget => content;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load()
|
||||
{
|
||||
@ -71,6 +69,11 @@ namespace osu.Game.Overlays
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected override void UpdateState()
|
||||
{
|
||||
content.FadeColour(IsHovered ? ColourProvider.Light1 : ColourProvider.Light3, FADE_DURATION, Easing.OutQuint);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user