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

Add basic metadata display and remove outdated message about not saving

Browse Source
This commit is contained in:
Dean Herbert 2021-05-11 18:07:58 +09:00
parent a4e0529617
commit 1831f581aa
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
osu.Game/Skinning/Editor/SkinEditor.cs
View File

@ -36,7 +36,8 @@ namespace osu.Game.Skinning.Editor
private Bindable<Skin> currentSkin; private Bindable<Skin> currentSkin;
private SkinBlueprintContainer blueprintContainer; [Resolved]
private OsuColour colours { get; set; }
public SkinEditor(Drawable targetScreen) public SkinEditor(Drawable targetScreen)
{ {
@ -46,7 +47,7 @@ namespace osu.Game.Skinning.Editor
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load()
{ {
InternalChild = new OsuContextMenuContainer InternalChild = new OsuContextMenuContainer
{ {
@ -61,7 +62,7 @@ namespace osu.Game.Skinning.Editor
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.X RelativeSizeAxes = Axes.X
}, },
blueprintContainer = new SkinBlueprintContainer(targetScreen), new SkinBlueprintContainer(targetScreen),
new SkinComponentToolbox(600) new SkinComponentToolbox(600)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
@ -103,13 +104,42 @@ namespace osu.Game.Skinning.Editor
}, },
} }
}; };
}
headerText.AddParagraph("Skin editor (preview)", cp => cp.Font = OsuFont.Default.With(size: 24)); protected override void LoadComplete()
headerText.AddParagraph("This is a preview of what is to come. Changes are lost on changing screens.", cp => {
base.LoadComplete();
Show();
// as long as the skin editor is loaded, let's make sure we can modify the current skin.
currentSkin = skins.CurrentSkin.GetBoundCopy();
// schedule ensures this only happens when the skin editor is visible.
// also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
// probably something which will be factored out in a future database refactor so not too concerning for now.
currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
}
private void skinChanged()
{
headerText.Clear();
headerText.AddParagraph("Skin editor", cp => cp.Font = OsuFont.Default.With(size: 24));
headerText.NewParagraph();
headerText.AddText("Currently editing ", cp =>
{ {
cp.Font = OsuFont.Default.With(size: 12); cp.Font = OsuFont.Default.With(size: 12);
cp.Colour = colours.Yellow; cp.Colour = colours.Yellow;
}); });
headerText.AddText($"{currentSkin.Value.SkinInfo}", cp =>
{
cp.Font = OsuFont.Default.With(size: 12, weight: FontWeight.Bold);
cp.Colour = colours.Yellow;
});
skins.EnsureMutableSkin();
} }
private void placeComponent(Type type) private void placeComponent(Type type)
@ -130,21 +160,6 @@ namespace osu.Game.Skinning.Editor
return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target); return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
} }
protected override void LoadComplete()
{
base.LoadComplete();
Show();
// as long as the skin editor is loaded, let's make sure we can modify the current skin.
currentSkin = skins.CurrentSkin.GetBoundCopy();
// schedule ensures this only happens when the skin editor is visible.
// also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
// probably something which will be factored out in a future database refactor so not too concerning for now.
currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skins.EnsureMutableSkin), true);
}
private void revert() private void revert()
{ {
SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray(); SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();