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

Add experimental collapse content logic based on width

Browse Source
This commit is contained in:
Joseph Madamba 2023-10-10 20:24:17 -07:00
parent e049a072f8
commit e4f1eab6ad
1 changed files with 73 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
osu.Game/Online/Leaderboards/LeaderboardScoreV2.cs
View File

@ -15,6 +15,7 @@ using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Layout;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Extensions; using osu.Game.Extensions;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -51,6 +52,7 @@ namespace osu.Game.Online.Leaderboards
private const float right_content_min_width = 180; private const float right_content_min_width = 180;
private const float grade_width = 40; private const float grade_width = 40;
private const float username_min_width = 100;
private readonly ScoreInfo score; private readonly ScoreInfo score;
@ -100,6 +102,10 @@ namespace osu.Game.Online.Leaderboards
private Drawable scoreRank = null!; private Drawable scoreRank = null!;
private Box totalScoreBackground = null!; private Box totalScoreBackground = null!;
private Container centreContent = null!;
private FillFlowContainer usernameAndFlagContainer = null!;
private FillFlowContainer statisticsContainer = null!;
public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip(); public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
public virtual ScoreInfo TooltipContent => score; public virtual ScoreInfo TooltipContent => score;
@ -152,7 +158,7 @@ namespace osu.Game.Online.Leaderboards
new Drawable[] new Drawable[]
{ {
new RankLabel(rank) { Shear = -shear }, new RankLabel(rank) { Shear = -shear },
createCentreContent(user), centreContent = createCentreContent(user),
createRightContent() createRightContent()
} }
} }
@ -215,22 +221,26 @@ namespace osu.Game.Online.Leaderboards
}, },
Content = new[] Content = new[]
{ {
new[] new Drawable[]
{ {
avatar = new MaskedWrapper( new Container
innerAvatar = new ClickableAvatar(user)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(1.1f),
Shear = -shear,
RelativeSizeAxes = Axes.Both,
})
{ {
RelativeSizeAxes = Axes.None, AutoSizeAxes = Axes.Both,
Size = new Vector2(height) Child = avatar = new MaskedWrapper(
innerAvatar = new ClickableAvatar(user)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(1.1f),
Shear = -shear,
RelativeSizeAxes = Axes.Both,
})
{
RelativeSizeAxes = Axes.None,
Size = new Vector2(height)
},
}, },
new FillFlowContainer usernameAndFlagContainer = new FillFlowContainer
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
@ -271,16 +281,22 @@ namespace osu.Game.Online.Leaderboards
} }
} }
}, },
new FillFlowContainer new Container
{ {
Margin = new MarginPadding { Right = 40 }, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(25),
Shear = -shear,
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
AutoSizeAxes = Axes.Both, Child = statisticsContainer = new FillFlowContainer
Direction = FillDirection.Horizontal, {
Children = statisticsLabels Padding = new MarginPadding { Right = 40 },
Spacing = new Vector2(25),
Shear = -shear,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = statisticsLabels
}
} }
} }
} }
@ -484,6 +500,42 @@ namespace osu.Game.Online.Leaderboards
totalScoreBackground.FadeColour(IsHovered ? lightenedGradient : totalScoreBackgroundGradient, transition_duration, Easing.OutQuint); totalScoreBackground.FadeColour(IsHovered ? lightenedGradient : totalScoreBackgroundGradient, transition_duration, Easing.OutQuint);
} }
protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
{
Scheduler.AddOnce(() =>
{
// TODO: may not always invalidate as expected
// when width decreases
// - hide statistics, then
// - hide avatar, then
// - hide user and flag and show avatar again
if (centreContent.DrawWidth >= height + username_min_width || centreContent.DrawWidth < username_min_width)
avatar.FadeIn(transition_duration, Easing.OutQuint).MoveToX(0, transition_duration, Easing.OutQuint);
else
avatar.FadeOut(transition_duration, Easing.OutQuint).MoveToX(-avatar.DrawWidth, transition_duration, Easing.OutQuint);
if (centreContent.DrawWidth >= username_min_width)
{
usernameAndFlagContainer.FadeIn(transition_duration, Easing.OutQuint).MoveToX(0, transition_duration, Easing.OutQuint);
innerAvatar.ShowUsernameTooltip = false;
}
else
{
usernameAndFlagContainer.FadeOut(transition_duration, Easing.OutQuint).MoveToX(usernameAndFlagContainer.DrawWidth, transition_duration, Easing.OutQuint);
innerAvatar.ShowUsernameTooltip = true;
}
if (centreContent.DrawWidth >= height + statisticsContainer.DrawWidth + username_min_width)
statisticsContainer.FadeIn(transition_duration, Easing.OutQuint).MoveToX(0, transition_duration, Easing.OutQuint);
else
statisticsContainer.FadeOut(transition_duration, Easing.OutQuint).MoveToX(statisticsContainer.DrawWidth, transition_duration, Easing.OutQuint);
});
return base.OnInvalidate(invalidation, source);
}
#region Subclasses #region Subclasses
private partial class DateLabel : DrawableDate private partial class DateLabel : DrawableDate