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

Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title

Browse Source
This commit is contained in:
Andrei Zavatski 2019-09-13 08:32:06 +03:00
commit 5a72083c13
7 changed files with 24 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneRankingsScopeSelector.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Current = { BindTarget = scope }
Current = scope
}
});

47
osu.Game/Graphics/UserInterface/GradientLineTabControl.cs
View File

@ -8,24 +8,20 @@ using osuTK;
using osu.Framework.Graphics.Shapes;
using osuTK.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Graphics.UserInterface
{
public class GradientLineTabControl<TModel> : PageTabControl<TModel>
public abstract class GradientLineTabControl<TModel> : PageTabControl<TModel>
{
protected override Dropdown<TModel> CreateDropdown() => null;
protected Color4 LineColour
{
get => line.MainColour.Value;
set => line.MainColour.Value = value;
get => line.Colour;
set => line.Colour = value;
}
private readonly GradientLine line;
public GradientLineTabControl()
protected GradientLineTabControl()
{
RelativeSizeAxes = Axes.X;
@ -36,6 +32,8 @@ namespace osu.Game.Graphics.UserInterface
});
}
protected override Dropdown<TModel> CreateDropdown() => null;
protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
{
Anchor = Anchor.BottomCentre,
@ -48,12 +46,6 @@ namespace osu.Game.Graphics.UserInterface
private class GradientLine : GridContainer
{
public readonly Bindable<Color4> MainColour = new Bindable<Color4>();
private readonly Box left;
private readonly Box middle;
private readonly Box right;
public GradientLine()
{
RelativeSizeAxes = Axes.X;
@ -70,34 +62,23 @@ namespace osu.Game.Graphics.UserInterface
{
new Drawable[]
{
left = new Box
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ColourInfo.GradientHorizontal(Color4.Transparent, Color4.White)
},
new Box
{
RelativeSizeAxes = Axes.Both,
},
middle = new Box
{
RelativeSizeAxes = Axes.Both,
},
right = new Box
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.Transparent)
},
}
};
}
protected override void LoadComplete()
{
MainColour.BindValueChanged(onColourChanged, true);
base.LoadComplete();
}
private void onColourChanged(ValueChangedEvent<Color4> colour)
{
left.Colour = ColourInfo.GradientHorizontal(colour.NewValue.Opacity(0), colour.NewValue);
middle.Colour = colour.NewValue;
right.Colour = ColourInfo.GradientHorizontal(colour.NewValue, colour.NewValue.Opacity(0));
}
}
}
}

1
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -215,6 +215,7 @@ namespace osu.Game.Online.Leaderboards
Origin = Anchor.BottomRight,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(1),
ChildrenEnumerable = score.Mods.Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
},
},

1
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
View File

@ -171,6 +171,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(1),
ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
{
AutoSizeAxes = Axes.Both,

3
osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
View File

@ -172,7 +172,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
: this(new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal
Direction = FillDirection.Horizontal,
Spacing = new Vector2(1),
})
{
}

9
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
View File

@ -12,12 +12,13 @@ using osu.Game.Rulesets.UI;
using osu.Game.Scoring;
using osu.Game.Beatmaps;
using osu.Framework.Localisation;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
public abstract class DrawableProfileScore : DrawableProfileRow
{
private readonly ScoreModsContainer modsContainer;
private readonly FillFlowContainer modsContainer;
protected readonly ScoreInfo Score;
protected DrawableProfileScore(ScoreInfo score)
@ -28,12 +29,12 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
Height = 60;
Children = new Drawable[]
{
modsContainer = new ScoreModsContainer
modsContainer = new FillFlowContainer
{
AutoSizeAxes = Axes.Y,
AutoSizeAxes = Axes.Both,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Width = 60,
Spacing = new Vector2(1),
Margin = new MarginPadding { Right = 160 }
}
};

21
osu.Game/Overlays/Profile/Sections/Ranks/ScoreModsContainer.cs
View File

@ -1,21 +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 osuTK;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.UI;
using System.Collections.Generic;
using System.Linq;
namespace osu.Game.Overlays.Profile.Sections.Ranks
{
public class ScoreModsContainer : FlowContainer<ModIcon>
{
protected override IEnumerable<Vector2> ComputeLayoutPositions()
{
int count = FlowingChildren.Count();
for (int i = 0; i < count; i++)
yield return new Vector2(DrawWidth * i * (count == 1 ? 0 : 1f / (count - 1)), 0);
}
}
}