h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 18:03:55 +08:00
Code Issues Releases Wiki Activity

Adjust namespaces and naming

Browse Source
This commit is contained in:
Dean Herbert
2025-04-22 16:56:20 +09:00
Unverified
parent 54c13937af
commit ec854f7b7f
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Collections/TestSceneCollectionDropdown.cs → osu.Game.Tests/Visual/SongSelect/TestSceneCollectionDropdown.cs
+1 -1
View File
@@ -22,7 +22,7 @@ using osu.Game.Tests.Resources;
using osuTK.Input;
using Realms;
namespace osu.Game.Tests.Visual.Collections
namespace osu.Game.Tests.Visual.SongSelect
{
public partial class TestSceneCollectionDropdown : OsuManualInputManagerTestScene
{
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs → osu.Game.Tests/Visual/SongSelect/TestSceneManageCollectionsDialog.cs
+1 -1
View File
@@ -20,7 +20,7 @@ using osu.Game.Tests.Resources;
using osuTK;
using osuTK.Input;
namespace osu.Game.Tests.Visual.Collections
namespace osu.Game.Tests.Visual.SongSelect
{
public partial class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
{
osu.Game.Tests/Visual/Collections/TestSceneShearedCollectionDropdown.cs → osu.Game.Tests/Visual/SongSelectV2/TestSceneCollectionDropdown.cs
+12 -11
View File
@@ -21,13 +21,14 @@ using osu.Game.Rulesets;
using osu.Game.Tests.Resources;
using osuTK.Input;
using Realms;
using CollectionDropdown = osu.Game.Screens.SelectV2.CollectionDropdown;
namespace osu.Game.Tests.Visual.Collections
namespace osu.Game.Tests.Visual.SongSelectV2
{
public partial class TestSceneShearedCollectionDropdown : OsuManualInputManagerTestScene
public partial class TestSceneCollectionDropdown : OsuManualInputManagerTestScene
{
private BeatmapManager beatmapManager = null!;
private ShearedCollectionDropdown dropdown = null!;
private CollectionDropdown dropdown = null!;
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
@@ -51,7 +52,7 @@ namespace osu.Game.Tests.Visual.Collections
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Child = dropdown = new ShearedCollectionDropdown
Child = dropdown = new CollectionDropdown
{
Width = 300,
Y = 100,
@@ -84,11 +85,11 @@ namespace osu.Game.Tests.Visual.Collections
AddStep("add collection", () => writeAndRefresh(r => r.Add(new BeatmapCollection(name: "2"))));
AddStep("add collection", () => writeAndRefresh(r => r.Add(new BeatmapCollection(name: "3"))));
AddAssert("check count 5", () => dropdown.ChildrenOfType<ShearedCollectionDropdown>().Single().ChildrenOfType<Menu.DrawableMenuItem>().Count(), () => Is.EqualTo(5));
AddAssert("check count 5", () => dropdown.ChildrenOfType<CollectionDropdown>().Single().ChildrenOfType<Menu.DrawableMenuItem>().Count(), () => Is.EqualTo(5));
AddStep("delete all collections", () => writeAndRefresh(r => r.RemoveAll<BeatmapCollection>()));
AddAssert("check count 2", () => dropdown.ChildrenOfType<ShearedCollectionDropdown>().Single().ChildrenOfType<Menu.DrawableMenuItem>().Count(), () => Is.EqualTo(2));
AddAssert("check count 2", () => dropdown.ChildrenOfType<CollectionDropdown>().Single().ChildrenOfType<Menu.DrawableMenuItem>().Count(), () => Is.EqualTo(2));
}
[Test]
@@ -212,12 +213,12 @@ namespace osu.Game.Tests.Visual.Collections
AddStep("watch for filter requests", () =>
{
received = false;
dropdown.ChildrenOfType<ShearedCollectionDropdown>().First().RequestFilter = () => received = true;
dropdown.ChildrenOfType<CollectionDropdown>().First().RequestFilter = () => received = true;
});
AddStep("click manage collections filter", () =>
{
int lastItemIndex = dropdown.ChildrenOfType<ShearedCollectionDropdown>().Single().Items.Count() - 1;
int lastItemIndex = dropdown.ChildrenOfType<CollectionDropdown>().Single().Items.Count() - 1;
InputManager.MoveMouseTo(getCollectionDropdownItemAt(lastItemIndex));
InputManager.Click(MouseButton.Left);
});
@@ -237,7 +238,7 @@ namespace osu.Game.Tests.Visual.Collections
private void assertCollectionHeaderDisplays(string collectionName, bool shouldDisplay = true)
=> AddUntilStep($"collection dropdown header displays '{collectionName}'",
() => shouldDisplay == dropdown.ChildrenOfType<ShearedCollectionDropdown.ShearedDropdownHeader>().Any(h => h.ChildrenOfType<SpriteText>().Any(t => t.Text == collectionName)));
() => shouldDisplay == dropdown.ChildrenOfType<CollectionDropdown.ShearedDropdownHeader>().Any(h => h.ChildrenOfType<SpriteText>().Any(t => t.Text == collectionName)));
private void assertFirstButtonIs(IconUsage icon) => AddUntilStep($"button is {icon.Icon.ToString()}", () => getAddOrRemoveButton(1).Icon.Equals(icon));
@@ -251,7 +252,7 @@ namespace osu.Game.Tests.Visual.Collections
private void addExpandHeaderStep() => AddStep("expand header", () =>
{
InputManager.MoveMouseTo(dropdown.ChildrenOfType<ShearedCollectionDropdown.ShearedDropdownHeader>().Single());
InputManager.MoveMouseTo(dropdown.ChildrenOfType<CollectionDropdown.ShearedDropdownHeader>().Single());
InputManager.Click(MouseButton.Left);
});
@@ -264,7 +265,7 @@ namespace osu.Game.Tests.Visual.Collections
private Menu.DrawableMenuItem getCollectionDropdownItemAt(int index)
{
// todo: we should be able to use Items, but apparently that's not guaranteed to be ordered... see: https://github.com/ppy/osu-framework/pull/6079
CollectionFilterMenuItem item = dropdown.ChildrenOfType<ShearedCollectionDropdown>().Single().ItemSource.ElementAt(index);
CollectionFilterMenuItem item = dropdown.ChildrenOfType<CollectionDropdown>().Single().ItemSource.ElementAt(index);
return dropdown.ChildrenOfType<Menu.DrawableMenuItem>().Single(i => i.Item.Text.Value == item.CollectionName);
}
}
osu.Game/Overlays/Music/NowPlayingCollectionDropdown.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Music
/// <summary>
/// A <see cref="CollectionDropdown"/> for use in the <see cref="NowPlayingOverlay"/>.
/// </summary>
public partial class NowPlayingCollectionDropdown : CollectionDropdown
public partial class NowPlayingCollectionDropdown : CollectionDropdown // TODO: class is now unused. if we decide this isn't coming back it can be nuked.
{
protected override bool ShowManageCollectionsItem => false;
osu.Game/Collections/ShearedCollectionDropdown.cs → osu.Game/Screens/SelectV2/CollectionDropdown.cs
+4 -3
View File
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Collections;
using osu.Game.Database;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
@@ -20,12 +21,12 @@ using osu.Game.Graphics.UserInterfaceV2;
using osuTK;
using Realms;
namespace osu.Game.Collections
namespace osu.Game.Screens.SelectV2
{
/// <summary>
/// A dropdown to select the collection to be used to filter results.
/// </summary>
public partial class ShearedCollectionDropdown : ShearedDropdown<CollectionFilterMenuItem>
public partial class CollectionDropdown : ShearedDropdown<CollectionFilterMenuItem> // TODO: partial class under FilterControl?
{
/// <summary>
/// Whether to show the "manage collections..." menu item in the dropdown.
@@ -46,7 +47,7 @@ namespace osu.Game.Collections
private readonly CollectionFilterMenuItem allBeatmapsItem = new AllBeatmapsCollectionFilterMenuItem();
public ShearedCollectionDropdown()
public CollectionDropdown()
: base("Collection")
{
ItemSource = filters;