From 33382416327e95b1bb0ddfee86fe1f32d1f4a0bd Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 19 Feb 2020 19:48:34 +0900 Subject: [PATCH] Add back filter control background, adjust opacity --- osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 3 ++- osu.Game/Screens/Multi/Multiplayer.cs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs index 666051ba8e..300418441e 100644 --- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs +++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using osu.Framework.Allocation; using osu.Framework.Bindables; +using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Threading; using osu.Game.Overlays.SearchableList; using osu.Game.Rulesets; @@ -13,7 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components { public class FilterControl : SearchableListFilterControl { - protected override Color4 BackgroundColour => Color4.Transparent; + protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f); protected override PrimaryFilter DefaultTab => PrimaryFilter.Open; protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public; diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 13537e2be8..07d930fa75 100644 --- a/osu.Game/Screens/Multi/Multiplayer.cs +++ b/osu.Game/Screens/Multi/Multiplayer.cs @@ -75,6 +75,8 @@ namespace osu.Game.Screens.Multi RelativeSizeAxes = Axes.Both; Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING }; + var backgroundColour = OsuColour.FromHex(@"3e3a44"); + InternalChild = waves = new MultiplayerWaveContainer { RelativeSizeAxes = Axes.Both, @@ -83,7 +85,7 @@ namespace osu.Game.Screens.Multi new Box { RelativeSizeAxes = Axes.Both, - Colour = OsuColour.FromHex(@"3e3a44"), + Colour = backgroundColour, }, new Container { @@ -118,7 +120,7 @@ namespace osu.Game.Screens.Multi Child = new Box { RelativeSizeAxes = Axes.Both, - Colour = ColourInfo.GradientVertical(OsuColour.FromHex(@"3e3a44").Opacity(0.6f), OsuColour.FromHex(@"3e3a44")) + Colour = ColourInfo.GradientVertical(backgroundColour.Opacity(0.7f), backgroundColour) }, } }