h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 12:43:16 +08:00
Code Issues Releases Wiki Activity

Tidy up method naming and structure for expanded state changes

Browse Source
This commit is contained in:
Dean Herbert 2021-12-15 16:02:43 +09:00
parent ef4ab74565
commit 7a9db22c52
2 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
View File

@ -284,7 +284,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
Hovered = _ =>
{
content.ScheduleShow();
content.ExpandAfterDelay();
return false;
},
Unhovered = _ =>
@ -292,7 +292,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
// This hide should only trigger if the expanded content has not shown yet.
// ie. if the user has not shown intent to want to see it (quickly moved over the info row area).
if (!Expanded.Value)
content.ScheduleHide();
content.CollapseAfterDelay();
}
}
}
@ -368,7 +368,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
protected override void OnHoverLost(HoverLostEvent e)
{
content.ScheduleHide();
content.CollapseAfterDelay();
updateState();
base.OnHoverLost(e);

52
osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards
AutoSizeAxes = Axes.Y,
CornerRadius = BeatmapCard.CORNER_RADIUS,
Masking = true,
Unhovered = _ => checkForHide(),
Unhovered = _ => collapseIfNotHovered(),
Children = new Drawable[]
{
background = new Box
@ -78,10 +78,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards
Alpha = 0,
Hovered = _ =>
{
keep();
queueExpandedStateChange(true);
return true;
},
Unhovered = _ => checkForHide(),
Unhovered = _ => collapseIfNotHovered(),
Child = dropdownScroll = new ExpandedContentScrollContainer
{
RelativeSizeAxes = Axes.X,
@ -121,51 +121,23 @@ namespace osu.Game.Beatmaps.Drawables.Cards
private ScheduledDelegate? scheduledExpandedChange;
public void ScheduleShow()
{
scheduledExpandedChange?.Cancel();
if (Expanded.Disabled || Expanded.Value)
return;
public void ExpandAfterDelay() => queueExpandedStateChange(true, 100);
scheduledExpandedChange = Scheduler.AddDelayed(() =>
{
if (!Expanded.Disabled)
expanded.Value = true;
}, 100);
public void CollapseAfterDelay() => queueExpandedStateChange(false, 500);
private void collapseIfNotHovered()
{
if (!content.IsHovered && !dropdownContent.IsHovered)
queueExpandedStateChange(false);
}
public void ScheduleHide()
{
scheduledExpandedChange?.Cancel();
if (Expanded.Disabled || !Expanded.Value)
return;
scheduledExpandedChange = Scheduler.AddDelayed(() =>
{
if (!Expanded.Disabled)
expanded.Value = false;
}, 500);
}
private void checkForHide()
{
if (Expanded.Disabled)
return;
if (content.IsHovered || dropdownContent.IsHovered)
return;
scheduledExpandedChange?.Cancel();
expanded.Value = false;
}
private void keep()
private void queueExpandedStateChange(bool newState, int delay = 0)
{
if (Expanded.Disabled)
return;
scheduledExpandedChange?.Cancel();
expanded.Value = true;
scheduledExpandedChange = Scheduler.AddDelayed(() => expanded.Value = newState, delay);
}
private void updateState()