mirror of
https://github.com/ppy/osu.git
synced 2025-03-11 05:17:25 +08:00
Remove unnecessary V2 suffixes
This commit is contained in:
parent
d8f3dbf988
commit
3a0464299a
@ -11,12 +11,12 @@ namespace osu.Game.Tests.Visual.SongSelectV2
|
|||||||
{
|
{
|
||||||
public partial class TestSceneUpdateBeatmapSetButtonV2 : OsuTestScene
|
public partial class TestSceneUpdateBeatmapSetButtonV2 : OsuTestScene
|
||||||
{
|
{
|
||||||
private UpdateBeatmapSetButtonV2 button = null!;
|
private UpdateBeatmapSetButton button = null!;
|
||||||
|
|
||||||
[SetUp]
|
[SetUp]
|
||||||
public void SetUp() => Schedule(() =>
|
public void SetUp() => Schedule(() =>
|
||||||
{
|
{
|
||||||
Child = button = new UpdateBeatmapSetButtonV2
|
Child = button = new UpdateBeatmapSetButton
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
|
@ -38,7 +38,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
private ConstrainedIconContainer difficultyIcon = null!;
|
private ConstrainedIconContainer difficultyIcon = null!;
|
||||||
private OsuSpriteText keyCountText = null!;
|
private OsuSpriteText keyCountText = null!;
|
||||||
private StarRatingDisplay starRatingDisplay = null!;
|
private StarRatingDisplay starRatingDisplay = null!;
|
||||||
private TopLocalRankV2 difficultyRank = null!;
|
private TopLocalRank difficultyRank = null!;
|
||||||
private OsuSpriteText difficultyText = null!;
|
private OsuSpriteText difficultyText = null!;
|
||||||
private OsuSpriteText authorText = null!;
|
private OsuSpriteText authorText = null!;
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
Anchor = Anchor.CentreLeft,
|
Anchor = Anchor.CentreLeft,
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
},
|
},
|
||||||
difficultyRank = new TopLocalRankV2
|
difficultyRank = new TopLocalRank
|
||||||
{
|
{
|
||||||
Anchor = Anchor.CentreLeft,
|
Anchor = Anchor.CentreLeft,
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
|
@ -35,7 +35,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
private OsuSpriteText titleText = null!;
|
private OsuSpriteText titleText = null!;
|
||||||
private OsuSpriteText artistText = null!;
|
private OsuSpriteText artistText = null!;
|
||||||
private Drawable chevronIcon = null!;
|
private Drawable chevronIcon = null!;
|
||||||
private UpdateBeatmapSetButtonV2 updateButton = null!;
|
private UpdateBeatmapSetButton updateButton = null!;
|
||||||
private BeatmapSetOnlineStatusPill statusPill = null!;
|
private BeatmapSetOnlineStatusPill statusPill = null!;
|
||||||
private DifficultySpectrumDisplay difficultiesDisplay = null!;
|
private DifficultySpectrumDisplay difficultiesDisplay = null!;
|
||||||
|
|
||||||
@ -98,7 +98,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
Margin = new MarginPadding { Top = 5f },
|
Margin = new MarginPadding { Top = 5f },
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
updateButton = new UpdateBeatmapSetButtonV2
|
updateButton = new UpdateBeatmapSetButton
|
||||||
{
|
{
|
||||||
Anchor = Anchor.CentreLeft,
|
Anchor = Anchor.CentreLeft,
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
|
@ -64,13 +64,13 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
|
|
||||||
private OsuSpriteText titleText = null!;
|
private OsuSpriteText titleText = null!;
|
||||||
private OsuSpriteText artistText = null!;
|
private OsuSpriteText artistText = null!;
|
||||||
private UpdateBeatmapSetButtonV2 updateButton = null!;
|
private UpdateBeatmapSetButton updateButton = null!;
|
||||||
private BeatmapSetOnlineStatusPill statusPill = null!;
|
private BeatmapSetOnlineStatusPill statusPill = null!;
|
||||||
|
|
||||||
private ConstrainedIconContainer difficultyIcon = null!;
|
private ConstrainedIconContainer difficultyIcon = null!;
|
||||||
private FillFlowContainer difficultyLine = null!;
|
private FillFlowContainer difficultyLine = null!;
|
||||||
private StarRatingDisplay difficultyStarRating = null!;
|
private StarRatingDisplay difficultyStarRating = null!;
|
||||||
private TopLocalRankV2 difficultyRank = null!;
|
private TopLocalRank difficultyRank = null!;
|
||||||
private OsuSpriteText difficultyKeyCountText = null!;
|
private OsuSpriteText difficultyKeyCountText = null!;
|
||||||
private OsuSpriteText difficultyName = null!;
|
private OsuSpriteText difficultyName = null!;
|
||||||
private OsuSpriteText difficultyAuthor = null!;
|
private OsuSpriteText difficultyAuthor = null!;
|
||||||
@ -121,7 +121,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
Margin = new MarginPadding { Top = 5f },
|
Margin = new MarginPadding { Top = 5f },
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
updateButton = new UpdateBeatmapSetButtonV2
|
updateButton = new UpdateBeatmapSetButton
|
||||||
{
|
{
|
||||||
Anchor = Anchor.CentreLeft,
|
Anchor = Anchor.CentreLeft,
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
@ -149,7 +149,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
Scale = new Vector2(8f / 9f),
|
Scale = new Vector2(8f / 9f),
|
||||||
Margin = new MarginPadding { Right = 5f },
|
Margin = new MarginPadding { Right = 5f },
|
||||||
},
|
},
|
||||||
difficultyRank = new TopLocalRankV2
|
difficultyRank = new TopLocalRank
|
||||||
{
|
{
|
||||||
Scale = new Vector2(8f / 11),
|
Scale = new Vector2(8f / 11),
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
|
@ -19,7 +19,7 @@ using Realms;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.SelectV2
|
namespace osu.Game.Screens.SelectV2
|
||||||
{
|
{
|
||||||
public partial class TopLocalRankV2 : CompositeDrawable
|
public partial class TopLocalRank : CompositeDrawable
|
||||||
{
|
{
|
||||||
private BeatmapInfo? beatmap;
|
private BeatmapInfo? beatmap;
|
||||||
|
|
||||||
@ -48,9 +48,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
|
|
||||||
private readonly UpdateableRank updateable;
|
private readonly UpdateableRank updateable;
|
||||||
|
|
||||||
public ScoreRank? DisplayedRank => updateable.Rank;
|
public TopLocalRank(BeatmapInfo? beatmap = null)
|
||||||
|
|
||||||
public TopLocalRankV2(BeatmapInfo? beatmap = null)
|
|
||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.Both;
|
AutoSizeAxes = Axes.Both;
|
||||||
|
|
@ -22,7 +22,7 @@ using osuTK.Graphics;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.SelectV2
|
namespace osu.Game.Screens.SelectV2
|
||||||
{
|
{
|
||||||
public partial class UpdateBeatmapSetButtonV2 : OsuAnimatedButton
|
public partial class UpdateBeatmapSetButton : OsuAnimatedButton
|
||||||
{
|
{
|
||||||
private BeatmapSetInfo? beatmapSet;
|
private BeatmapSetInfo? beatmapSet;
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ namespace osu.Game.Screens.SelectV2
|
|||||||
[Resolved]
|
[Resolved]
|
||||||
private IDialogOverlay? dialogOverlay { get; set; }
|
private IDialogOverlay? dialogOverlay { get; set; }
|
||||||
|
|
||||||
public UpdateBeatmapSetButtonV2()
|
public UpdateBeatmapSetButton()
|
||||||
{
|
{
|
||||||
Size = new Vector2(75f, 22f);
|
Size = new Vector2(75f, 22f);
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user