mirror of
https://github.com/ppy/osu.git
synced 2025-01-15 10:02:59 +08:00
Update editor screen switcher to match new design language
This commit is contained in:
parent
206f2ca208
commit
463b8130c8
@ -2,14 +2,13 @@
|
|||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Graphics.UserInterface;
|
using osu.Framework.Graphics.UserInterface;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Overlays;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
|
||||||
|
|
||||||
namespace osu.Game.Screens.Edit.Components.Menus
|
namespace osu.Game.Screens.Edit.Components.Menus
|
||||||
{
|
{
|
||||||
@ -22,22 +21,19 @@ namespace osu.Game.Screens.Edit.Components.Menus
|
|||||||
|
|
||||||
TabContainer.RelativeSizeAxes &= ~Axes.X;
|
TabContainer.RelativeSizeAxes &= ~Axes.X;
|
||||||
TabContainer.AutoSizeAxes = Axes.X;
|
TabContainer.AutoSizeAxes = Axes.X;
|
||||||
TabContainer.Padding = new MarginPadding();
|
TabContainer.Padding = new MarginPadding(10);
|
||||||
|
|
||||||
AddInternal(new Box
|
|
||||||
{
|
|
||||||
Anchor = Anchor.BottomLeft,
|
|
||||||
Origin = Anchor.BottomLeft,
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Height = 1,
|
|
||||||
Colour = Color4.White.Opacity(0.2f),
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(OsuColour colours)
|
private void load(OverlayColourProvider colourProvider)
|
||||||
{
|
{
|
||||||
AccentColour = colours.Yellow;
|
AccentColour = colourProvider.Light3;
|
||||||
|
|
||||||
|
AddInternal(new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Colour = colourProvider.Background2,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Dropdown<EditorScreenMode> CreateDropdown() => null;
|
protected override Dropdown<EditorScreenMode> CreateDropdown() => null;
|
||||||
@ -54,6 +50,15 @@ namespace osu.Game.Screens.Edit.Components.Menus
|
|||||||
Text.Margin = new MarginPadding();
|
Text.Margin = new MarginPadding();
|
||||||
Text.Anchor = Anchor.CentreLeft;
|
Text.Anchor = Anchor.CentreLeft;
|
||||||
Text.Origin = Anchor.CentreLeft;
|
Text.Origin = Anchor.CentreLeft;
|
||||||
|
|
||||||
|
Text.Font = OsuFont.TorusAlternate;
|
||||||
|
|
||||||
|
Bar.Expire();
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OverlayColourProvider colourProvider)
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnActivated()
|
protected override void OnActivated()
|
||||||
|
Loading…
Reference in New Issue
Block a user