RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-20 04:17:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better align scene selector with menu bar

Browse Source
This commit is contained in:
Dean Herbert 2022-03-15 15:11:47 +09:00
parent c6aa32a003
commit aff6a5a428
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.Play;
using osu.Game.Screens.Select;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Skinning.Editor
{
@ -71,6 +70,8 @@ namespace osu.Game.Skinning.Editor
{
RelativeSizeAxes = Axes.Both;
const float menu_height = 40;
InternalChild = new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
@ -78,10 +79,10 @@ namespace osu.Game.Skinning.Editor
{
new Container
{
Name = "Top bar",
Name = "Menu container",
RelativeSizeAxes = Axes.X,
Depth = float.MinValue,
Height = 40,
Height = menu_height,
Children = new Drawable[]
{
new EditorMenuBar
@ -117,7 +118,7 @@ namespace osu.Game.Skinning.Editor
new SceneLibrary
{
RelativeSizeAxes = Axes.X,
Y = 45,
Y = menu_height,
},
new GridContainer
@ -322,22 +323,26 @@ namespace osu.Game.Skinning.Editor
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }
public SceneLibrary()
{
Height = HEIGHT + padding * 2;
}
[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4Extensions.FromHex("222")
},
new OsuScrollContainer(Direction.Horizontal)
{
RelativeSizeAxes = Axes.X,
Height = HEIGHT + padding * 2,
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.5f)
},
new FillFlowContainer
{
Name = "Scene library",