RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-09 14:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply suggestions

Browse Source
This commit is contained in:
jorolf 2019-03-11 18:37:36 +01:00
parent af1c54d995
commit f3ab5070b9
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Graphics/UserInterface/ScreenTitle.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
set => titleText.Text = value;
}
public string Page
public string Section
{
get => pageText.Text;
set => pageText.Text = value;
@ -55,6 +55,7 @@ namespace osu.Game.Graphics.UserInterface
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(6, 0),
Children = new[]
{
titleText = new OsuSpriteText

22
osu.Game/Screens/Multi/Header.cs
View File

@ -17,11 +17,11 @@ namespace osu.Game.Screens.Multi
{
public const float HEIGHT = 121;
private readonly ScreenTitle title;
private readonly HeaderBreadcrumbControl breadcrumbs;
public Header(ScreenStack stack)
{
ScreenTitle title;
RelativeSizeAxes = Axes.X;
Height = HEIGHT;
@ -38,12 +38,12 @@ namespace osu.Game.Screens.Multi
Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
Children = new Drawable[]
{
title = new ScreenTitle
title = new MultiHeaderTitle
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.BottomLeft,
Icon = FontAwesome.fa_osu_multi,
Title = "multiplayer ",
Title = "multiplayer",
},
breadcrumbs = new HeaderBreadcrumbControl(stack)
{
@ -55,10 +55,10 @@ namespace osu.Game.Screens.Multi
},
};
breadcrumbs.Current.ValueChanged += scren =>
breadcrumbs.Current.ValueChanged += screen =>
{
if (scren.NewValue is IMultiplayerSubScreen multiScreen)
title.Page = multiScreen.ShortTitle.ToLowerInvariant();
if (screen.NewValue is IMultiplayerSubScreen multiScreen)
title.Section = multiScreen.ShortTitle.ToLowerInvariant();
};
breadcrumbs.Current.TriggerChange();
@ -67,10 +67,18 @@ namespace osu.Game.Screens.Multi
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
title.AccentColour = colours.Yellow;
breadcrumbs.StripColour = colours.Green;
}
private class MultiHeaderTitle : ScreenTitle
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
AccentColour = colours.Yellow;
}
}
private class HeaderBreadcrumbControl : ScreenBreadcrumbControl
{
public HeaderBreadcrumbControl(ScreenStack stack)