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

fixed naming

Browse Source
This commit is contained in:
nanashi-1 2022-11-16 09:42:40 +08:00
parent 7aec5ca1e8
commit 9101ad0cbd
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

@ -1161,11 +1161,11 @@ namespace osu.Game.Tests.Visual.SongSelect
public new BeatmapCarousel Carousel => base.Carousel; public new BeatmapCarousel Carousel => base.Carousel;
public new ModSelectOverlay ModSelect => base.ModSelect; public new ModSelectOverlay ModSelect => base.ModSelect;
public BeatmapOptionsButton DeleteOptionButton => base.deleteOptionButton; public new BeatmapOptionsButton DeleteOptionButton => base.DeleteOptionButton;
public BeatmapOptionsButton ClearOptionButton => base.clearOptionButton; public new BeatmapOptionsButton ClearOptionButton => base.ClearOptionButton;
public BeatmapOptionsButton? EditOptionButton => base.editOptionButton; public new BeatmapOptionsButton? EditOptionButton => base.EditOptionButton;
public new void PresentScore(ScoreInfo score) => base.PresentScore(score); public new void PresentScore(ScoreInfo score) => base.PresentScore(score);

6
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -34,12 +34,12 @@ namespace osu.Game.Screens.Select
private PlayBeatmapDetailArea playBeatmapDetailArea = null!; private PlayBeatmapDetailArea playBeatmapDetailArea = null!;
protected BeatmapOptionsButton? editOptionButton; protected BeatmapOptionsButton? EditOptionButton;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
editOptionButton = BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit()); EditOptionButton = BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.Solid.PencilAlt, colours.Yellow, () => Edit());
} }
protected void PresentScore(ScoreInfo score) => protected void PresentScore(ScoreInfo score) =>
@ -150,7 +150,7 @@ namespace osu.Game.Screens.Select
{ {
base.OnBeatmapOptionsButtonDisabledChanged(disabled); base.OnBeatmapOptionsButtonDisabledChanged(disabled);
if (editOptionButton != null) editOptionButton.Disabled = disabled; if (EditOptionButton != null) EditOptionButton.Disabled = disabled;
} }
} }
} }

12
osu.Game/Screens/Select/SongSelect.cs
View File

@ -116,9 +116,9 @@ namespace osu.Game.Screens.Select
private double audioFeedbackLastPlaybackTime; private double audioFeedbackLastPlaybackTime;
protected BeatmapOptionsButton deleteOptionButton; protected BeatmapOptionsButton DeleteOptionButton;
protected BeatmapOptionsButton clearOptionButton; protected BeatmapOptionsButton ClearOptionButton;
[CanBeNull] [CanBeNull]
private IDisposable modSelectOverlayRegistration; private IDisposable modSelectOverlayRegistration;
@ -290,8 +290,8 @@ namespace osu.Game.Screens.Select
BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show()); BeatmapOptions.AddButton(@"Manage", @"collections", FontAwesome.Solid.Book, colours.Green, () => manageCollectionsDialog?.Show());
BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null); BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null);
deleteOptionButton = BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo)); DeleteOptionButton = BeatmapOptions.AddButton(@"Delete", @"all difficulties", FontAwesome.Solid.Trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo));
clearOptionButton = BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo)); ClearOptionButton = BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.Solid.Eraser, colours.Purple, () => clearScores(Beatmap.Value.BeatmapInfo));
} }
sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty"); sampleChangeDifficulty = audio.Samples.Get(@"SongSelect/select-difficulty");
@ -659,8 +659,8 @@ namespace osu.Game.Screens.Select
protected virtual void OnBeatmapOptionsButtonDisabledChanged(bool disabled) protected virtual void OnBeatmapOptionsButtonDisabledChanged(bool disabled)
{ {
deleteOptionButton.Disabled = disabled; DeleteOptionButton.Disabled = disabled;
clearOptionButton.Disabled = disabled; ClearOptionButton.Disabled = disabled;
} }
private void playExitingTransition() private void playExitingTransition()