h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 15:43:18 +08:00
Code Issues Releases Wiki Activity

Further refactoring and bindable simplification

Browse Source
This commit is contained in:
Dean Herbert 2020-12-15 12:52:38 +09:00
parent 33f77f81f2
commit cafe81ab97
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Screens/Import/FileImportScreen.cs
View File

@ -12,11 +12,10 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Graphics.UserInterfaceV2;
using osuTK; using osuTK;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.Containers;
using osuTK.Graphics;
namespace osu.Game.Screens.Import namespace osu.Game.Screens.Import
{ {
@ -24,13 +23,9 @@ namespace osu.Game.Screens.Import
{ {
public override bool HideOverlaysOnEnter => true; public override bool HideOverlaysOnEnter => true;
private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
private FileSelector fileSelector; private FileSelector fileSelector;
private Container contentContainer; private Container contentContainer;
private TextFlowContainer currentFileText; private TextFlowContainer currentFileText;
private OsuScrollContainer fileNameScroll;
private TriangleButton importButton; private TriangleButton importButton;
@ -47,9 +42,6 @@ namespace osu.Game.Screens.Import
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(Storage storage) private void load(Storage storage)
{ {
storage.GetStorageForDirectory("imports");
var originalPath = storage.GetFullPath("imports", true);
InternalChild = contentContainer = new Container InternalChild = contentContainer = new Container
{ {
Masking = true, Masking = true,
@ -65,7 +57,7 @@ namespace osu.Game.Screens.Import
Colour = colours.GreySeafoamDark, Colour = colours.GreySeafoamDark,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
fileSelector = new FileSelector(originalPath, game.HandledExtensions.ToArray()) fileSelector = new FileSelector(validFileExtensions: game.HandledExtensions.ToArray())
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Width = 0.65f Width = 0.65f
@ -87,7 +79,7 @@ namespace osu.Game.Screens.Import
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 }, Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
Child = fileNameScroll = new OsuScrollContainer Child = new OsuScrollContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
@ -100,6 +92,11 @@ namespace osu.Game.Screens.Import
Origin = Anchor.Centre, Origin = Anchor.Centre,
TextAnchor = Anchor.Centre TextAnchor = Anchor.Centre
}, },
ScrollContent =
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
}, },
}, },
importButton = new TriangleButton importButton = new TriangleButton
@ -111,25 +108,21 @@ namespace osu.Game.Screens.Import
Height = button_height, Height = button_height,
Width = 0.9f, Width = 0.9f,
Margin = new MarginPadding { Vertical = button_vertical_margin }, Margin = new MarginPadding { Vertical = button_vertical_margin },
Action = () => startImport(currentFile.Value?.FullName) Action = () => startImport(fileSelector.CurrentFile.Value?.FullName)
} }
} }
} }
} }
}; };
fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
fileNameScroll.ScrollContent.Origin = Anchor.Centre;
currentFile.BindValueChanged(fileChanged, true); fileSelector.CurrentFile.BindValueChanged(fileChanged, true);
currentDirectory.BindValueChanged(directoryChanged); fileSelector.CurrentPath.BindValueChanged(directoryChanged);
currentDirectory.BindTo(fileSelector.CurrentPath);
currentFile.BindTo(fileSelector.CurrentFile);
} }
private void directoryChanged(ValueChangedEvent<DirectoryInfo> v) private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
{ {
currentFile.Value = null; // this should probably be done by the selector itself, but let's do it here for now.
fileSelector.CurrentFile.Value = null;
} }
private void fileChanged(ValueChangedEvent<FileInfo> selectedFile) private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)