h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:23:02 +08:00
Code Issues Releases Wiki Activity

Merge branch 'file-selector' into editor-load-audio

Browse Source
This commit is contained in:
Dean Herbert 2020-09-25 12:44:00 +09:00
commit 71e1f981fe
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Settings/TestSceneFileSelector.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Graphics.UserInterfaceV2;
@ -9,10 +9,16 @@ namespace osu.Game.Tests.Visual.Settings
{ {
public class TestSceneFileSelector : OsuTestScene public class TestSceneFileSelector : OsuTestScene
{ {
[BackgroundDependencyLoader] [Test]
private void load() public void TestAllFiles()
{ {
Add(new FileSelector { RelativeSizeAxes = Axes.Both }); AddStep("create", () => Child = new FileSelector { RelativeSizeAxes = Axes.Both });
}
[Test]
public void TestJpgFilesOnly()
{
AddStep("create", () => Child = new FileSelector(validFileExtensions: new[] { ".jpg" }) { RelativeSizeAxes = Axes.Both });
} }
} }
} }

28
osu.Game/Graphics/UserInterfaceV2/FileSelector.cs
View File

@ -62,7 +62,33 @@ namespace osu.Game.Graphics.UserInterfaceV2
protected override string FallbackName => file.Name; protected override string FallbackName => file.Name;
protected override IconUsage? Icon => FontAwesome.Regular.FileAudio; protected override IconUsage? Icon
{
get
{
switch (file.Extension)
{
case ".ogg":
case ".mp3":
case ".wav":
return FontAwesome.Regular.FileAudio;
case ".jpg":
case ".jpeg":
case ".png":
return FontAwesome.Regular.FileImage;
case ".mp4":
case ".avi":
case ".mov":
case ".flv":
return FontAwesome.Regular.FileVideo;
default:
return FontAwesome.Regular.File;
}
}
}
} }
} }
} }