RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add settings modification UI to skin editor

Browse Source
This commit is contained in:
Dean Herbert 2022-03-11 23:30:46 +09:00
parent c99397f75a
commit 8d1ee28e67
4 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs
View File

@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Edit
{
protected readonly OsuScrollContainer Scroll;
protected readonly FillFlowContainer FillFlow;
protected override Container<Drawable> Content { get; }
public ScrollingToolboxGroup(string title, float scrollAreaHeight)
@ -20,7 +22,7 @@ namespace osu.Game.Rulesets.Edit
{
RelativeSizeAxes = Axes.X,
Height = scrollAreaHeight,
Child = Content = new FillFlowContainer
Child = Content = FillFlow = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,

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

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
@ -11,10 +12,12 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events;
using osu.Framework.Testing;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Cursor;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Edit;
using osu.Game.Screens.Edit.Components.Menus;
namespace osu.Game.Skinning.Editor
@ -44,6 +47,8 @@ namespace osu.Game.Skinning.Editor
private Container content;
private EditorToolboxGroup settingsToolbox;
public SkinEditor(Drawable targetScreen)
{
RelativeSizeAxes = Axes.Both;
@ -103,7 +108,8 @@ namespace osu.Game.Skinning.Editor
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
new Dimension()
new Dimension(),
new Dimension(GridSizeMode.AutoSize),
},
Content = new[]
{
@ -119,6 +125,11 @@ namespace osu.Game.Skinning.Editor
{
RelativeSizeAxes = Axes.Both,
},
settingsToolbox = new SkinSettingsToolbox
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
}
}
}
}
@ -143,12 +154,15 @@ namespace osu.Game.Skinning.Editor
hasBegunMutating = false;
Scheduler.AddOnce(skinChanged);
}, true);
SelectedComponents.BindCollectionChanged(selectionChanged);
}
public void UpdateTargetScreen(Drawable targetScreen)
{
this.targetScreen = targetScreen;
SelectedComponents.Clear();
Scheduler.AddOnce(loadBlueprintContainer);
void loadBlueprintContainer()
@ -210,6 +224,18 @@ namespace osu.Game.Skinning.Editor
SelectedComponents.Add(component);
}
private void selectionChanged(object sender, NotifyCollectionChangedEventArgs e)
{
settingsToolbox.Clear();
var first = SelectedComponents.OfType<Drawable>().FirstOrDefault();
if (first != null)
{
settingsToolbox.Children = first.CreateSettingsControls().ToArray();
}
}
private IEnumerable<ISkinnableTarget> availableTargets => targetScreen.ChildrenOfType<ISkinnableTarget>();
private ISkinnableTarget getTarget(SkinnableTarget target)

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

@ -101,9 +101,11 @@ namespace osu.Game.Skinning.Editor
private void editorVisibilityChanged(ValueChangedEvent<Visibility> visibility)
{
const float toolbar_padding_requirement = 0.18f;
if (visibility.NewValue == Visibility.Visible)
{
target.SetCustomRect(new RectangleF(0.18f, 0.1f, VISIBLE_TARGET_SCALE, VISIBLE_TARGET_SCALE), true);
target.SetCustomRect(new RectangleF(toolbar_padding_requirement, 0.1f, 0.8f - toolbar_padding_requirement, 0.7f), true);
}
else
{

23
osu.Game/Skinning/Editor/SkinSettingsToolbox.cs Normal file
View File

@ -0,0 +1,23 @@
// 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.
using osu.Framework.Graphics;
using osu.Game.Rulesets.Edit;
using osuTK;
namespace osu.Game.Skinning.Editor
{
internal class SkinSettingsToolbox : ScrollingToolboxGroup
{
public const float WIDTH = 200;
public SkinSettingsToolbox()
: base("Settings", 600)
{
RelativeSizeAxes = Axes.None;
Width = WIDTH;
FillFlow.Spacing = new Vector2(10);
}
}
}