h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 09:22:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #12767 from peppy/save-on-forced-exit

Browse Source 
Save skin editor changes on forced exit
This commit is contained in:
Dean Herbert 2021-05-13 23:35:52 +09:00 committed by GitHub
commit caa3e1dca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@ namespace osu.Game.Skinning.Editor
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
private bool hasBegunMutating;
public SkinEditor(Drawable targetScreen) public SkinEditor(Drawable targetScreen)
{ {
this.targetScreen = targetScreen; this.targetScreen = targetScreen;
@ -108,7 +110,7 @@ namespace osu.Game.Skinning.Editor
{ {
Text = "Save Changes", Text = "Save Changes",
Width = 140, Width = 140,
Action = save, Action = Save,
}, },
new DangerousTriangleButton new DangerousTriangleButton
{ {
@ -139,7 +141,11 @@ namespace osu.Game.Skinning.Editor
// schedule ensures this only happens when the skin editor is visible. // 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). // 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. // 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); currentSkin.BindValueChanged(skin =>
{
hasBegunMutating = false;
Scheduler.AddOnce(skinChanged);
}, true);
} }
private void skinChanged() private void skinChanged()
@ -161,6 +167,7 @@ namespace osu.Game.Skinning.Editor
}); });
skins.EnsureMutableSkin(); skins.EnsureMutableSkin();
hasBegunMutating = true;
} }
private void placeComponent(Type type) private void placeComponent(Type type)
@ -204,8 +211,11 @@ namespace osu.Game.Skinning.Editor
} }
} }
private void save() public void Save()
{ {
if (!hasBegunMutating)
return;
SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray(); SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
foreach (var t in targetContainers) foreach (var t in targetContainers)

2
osu.Game/Skinning/Editor/SkinEditorOverlay.cs
View File

@ -92,8 +92,10 @@ namespace osu.Game.Skinning.Editor
/// </summary> /// </summary>
public void Reset() public void Reset()
{ {
skinEditor?.Save();
skinEditor?.Hide(); skinEditor?.Hide();
skinEditor?.Expire(); skinEditor?.Expire();
skinEditor = null; skinEditor = null;
} }
} }