h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 01:43:15 +08:00
Code Issues Releases Wiki Activity

Add Lounge FilterControl.

Browse Source
This commit is contained in:
DrabWeb 2018-05-22 00:24:39 -03:00
parent cae09492c3
commit f7a4a4eeef
7 changed files with 87 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseLounge.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Allocation;
using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osu.Game.Screens.Multi.Screens;
using osu.Game.Screens.Multi.Screens.Lounge;
using osu.Game.Users;
namespace osu.Game.Tests.Visual

2
osu.Game.Tests/Visual/TestCaseMultiHeader.cs
View File

@ -4,7 +4,7 @@
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Screens;
using osu.Game.Screens.Multi.Screens.Lounge;
namespace osu.Game.Tests.Visual
{

1
osu.Game/Online/Multiplayer/Room.cs
View File

@ -12,6 +12,7 @@ namespace osu.Game.Online.Multiplayer
public Bindable<string> Name = new Bindable<string>();
public Bindable<User> Host = new Bindable<User>();
public Bindable<RoomStatus> Status = new Bindable<RoomStatus>();
public Bindable<RoomAvailability> Availability = new Bindable<RoomAvailability>();
public Bindable<GameType> Type = new Bindable<GameType>();
public Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public Bindable<int?> MaxParticipants = new Bindable<int?>();

18
osu.Game/Online/Multiplayer/RoomAvailability.cs Normal file
View File

@ -0,0 +1,18 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.ComponentModel;
namespace osu.Game.Online.Multiplayer
{
public enum RoomAvailability
{
Public,
[Description(@"Friends Only")]
FriendsOnly,
[Description(@"Invite Only")]
InviteOnly,
}
}

2
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -8,7 +8,7 @@ using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
using osu.Game.Screens.Multi.Screens;
using osu.Game.Screens.Multi.Screens.Lounge;
namespace osu.Game.Screens.Multi
{

27
osu.Game/Screens/Multi/Screens/Lounge/FilterControl.cs Normal file
View File

@ -0,0 +1,27 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using OpenTK.Graphics;
namespace osu.Game.Screens.Multi.Screens.Lounge
{
public class FilterControl : SearchableListFilterControl<LoungeTab, LoungeTab>
{
protected override Color4 BackgroundColour => OsuColour.FromHex(@"362e42");
protected override LoungeTab DefaultTab => LoungeTab.Public;
public FilterControl()
{
DisplayStyleControl.Hide();
}
}
public enum LoungeTab
{
Public = RoomAvailability.Public,
Private = RoomAvailability.FriendsOnly,
}
}

40
osu.Game/Screens/Multi/Screens/Lounge.cs → osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
View File

@ -1,21 +1,24 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Screens;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using osu.Game.Screens.Multi.Components;
using OpenTK;
namespace osu.Game.Screens.Multi.Screens
namespace osu.Game.Screens.Multi.Screens.Lounge
{
public class Lounge : MultiplayerScreen
{
private readonly FilterControl filter;
private readonly Container content;
private readonly FillFlowContainer<DrawableRoom> roomsFlow;
private readonly RoomInspector roomInspector;
@ -50,6 +53,7 @@ namespace osu.Game.Screens.Multi.Screens
{
Children = new Drawable[]
{
filter = new FilterControl(),
content = new Container
{
RelativeSizeAxes = Axes.Both,
@ -84,6 +88,8 @@ namespace osu.Game.Screens.Multi.Screens
},
},
};
filter.Search.Exit += Exit;
}
protected override void UpdateAfterChildren()
@ -92,11 +98,41 @@ namespace osu.Game.Screens.Multi.Screens
content.Padding = new MarginPadding
{
Top = filter.DrawHeight,
Left = SearchableListOverlay.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH,
Right = SearchableListOverlay.WIDTH_PADDING,
};
}
protected override void OnFocus(InputState state)
{
GetContainingInputManager().ChangeFocus(filter.Search);
}
protected override void OnEntering(Screen last)
{
base.OnEntering(last);
filter.Search.HoldFocus = true;
}
protected override bool OnExiting(Screen next)
{
filter.Search.HoldFocus = false;
return base.OnExiting(next);
}
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
filter.Search.HoldFocus = true;
}
protected override void OnSuspending(Screen next)
{
base.OnSuspending(next);
filter.Search.HoldFocus = false;
}
private void didSelect(DrawableRoom room)
{
roomsFlow.Children.ForEach(c =>