RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `LocalPlayer` to `User` in mod select prefixes

This commit is contained in:
Dean Herbert 2021-09-01 17:22:52 +09:00
parent fb5f3fb9af
commit 9e21f5a59c
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -529,7 +529,7 @@ public void TestLeaveNavigation()
AddStep("invoke on back button", () => multiplayerScreen.OnBackButton());
AddAssert("mod overlay is hidden", () => this.ChildrenOfType<LocalPlayerModSelectOverlay>().Single().State.Value == Visibility.Hidden);
AddAssert("mod overlay is hidden", () => this.ChildrenOfType<UserModSelectOverlay>().Single().State.Value == Visibility.Hidden);
AddAssert("dialog overlay is hidden", () => DialogOverlay.State.Value == Visibility.Hidden);

2
osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
View File

@ -422,7 +422,7 @@ private void createDisplay(Func<TestModSelectOverlay> createOverlayFunc)
};
}
private class TestModSelectOverlay : LocalPlayerModSelectOverlay
private class TestModSelectOverlay : UserModSelectOverlay
{
public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;

2
osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
View File

@ -151,7 +151,7 @@ private void openModSelect()
AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
}
private class TestModSelectOverlay : LocalPlayerModSelectOverlay
private class TestModSelectOverlay : UserModSelectOverlay
{
public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
public new TriangleButton CustomiseButton => base.CustomiseButton;

6
osu.Game/Overlays/Mods/IncompatibilityDisplayingModButton.cs
View File

@ -65,9 +65,9 @@ private void updateCompatibility()
incompatibleIcon.Hide();
}
public override ITooltip<Mod> GetCustomTooltip() => new LocalPlayerModButtonTooltip();
public override ITooltip<Mod> GetCustomTooltip() => new IncompatibilityDisplayingTooltip();
private class LocalPlayerModButtonTooltip : ModButtonTooltip
private class IncompatibilityDisplayingTooltip : ModButtonTooltip
{
private readonly OsuSpriteText incompatibleText;
@ -76,7 +76,7 @@ private class LocalPlayerModButtonTooltip : ModButtonTooltip
[Resolved]
private Bindable<RulesetInfo> ruleset { get; set; }
public LocalPlayerModButtonTooltip()
public IncompatibilityDisplayingTooltip()
{
AddRange(new Drawable[]
{

8
osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs → osu.Game/Overlays/Mods/UserModSelectOverlay.cs
View File

@ -5,7 +5,7 @@
namespace osu.Game.Overlays.Mods
{
public class LocalPlayerModSelectOverlay : ModSelectOverlay
public class UserModSelectOverlay : ModSelectOverlay
{
protected override void OnModSelected(Mod mod)
{
@ -15,11 +15,11 @@ protected override void OnModSelected(Mod mod)
section.DeselectTypes(mod.IncompatibleMods, true, mod);
}
protected override ModSection CreateModSection(ModType type) => new LocalPlayerModSection(type);
protected override ModSection CreateModSection(ModType type) => new UserModSection(type);
private class LocalPlayerModSection : ModSection
private class UserModSection : ModSection
{
public LocalPlayerModSection(ModType type)
public UserModSection(ModType type)
: base(type)
{
}

4
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -429,10 +429,6 @@ private void cancelTrackLooping()
/// <param name="room">The room to change the settings of.</param>
protected abstract RoomSettingsOverlay CreateRoomSettingsOverlay(Room room);
private class UserModSelectOverlay : LocalPlayerModSelectOverlay
{
}
public class UserModSelectButton : PurpleTriangleButton
{
}

2
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -152,7 +152,7 @@ public override bool OnExiting(IScreen next)
return base.OnExiting(next);
}
protected override ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay
protected override ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay
{
IsValidMod = IsValidMod
};

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

@ -315,7 +315,7 @@ private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, M
(new FooterButtonOptions(), BeatmapOptions)
};
protected virtual ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay();
protected virtual ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay();
protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
{