From f3ab5070b97e1845c8af1a7270f30058f081c790 Mon Sep 17 00:00:00 2001 From: jorolf Date: Mon, 11 Mar 2019 18:37:36 +0100 Subject: [PATCH] apply suggestions --- .../Graphics/UserInterface/ScreenTitle.cs | 3 ++- osu.Game/Screens/Multi/Header.cs | 22 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/ScreenTitle.cs b/osu.Game/Graphics/UserInterface/ScreenTitle.cs index d931d2561a..d7cba06d9d 100644 --- a/osu.Game/Graphics/UserInterface/ScreenTitle.cs +++ b/osu.Game/Graphics/UserInterface/ScreenTitle.cs @@ -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 diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs index 668b2f5995..bb4acc6007 100644 --- a/osu.Game/Screens/Multi/Header.cs +++ b/osu.Game/Screens/Multi/Header.cs @@ -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)