h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into multiplayer-match-rulesets

Browse Source
This commit is contained in:
Dean Herbert 2021-08-03 23:40:24 +09:00
commit c856611f65
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs → osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs
View File

@ -14,7 +14,7 @@ using osuTK;
namespace osu.Game.Screens.OnlinePlay.Match.Components
{
public class GameTypePicker : DisableableTabControl<MatchType>
public class MatchTypePicker : DisableableTabControl<MatchType>
{
private const float height = 40;
private const float selection_width = 3;
@ -23,13 +23,15 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
protected override Dropdown<MatchType> CreateDropdown() => null;
public GameTypePicker()
public MatchTypePicker()
{
Height = height + selection_width * 2;
TabContainer.Spacing = new Vector2(10 - selection_width * 2);
AddItem(MatchType.HeadToHead);
AddItem(MatchType.TeamVersus);
// TODO: remove after osu-web is updated to set the correct default type.
AddItem(MatchType.Playlists);
}
private class GameTypePickerItem : DisableableTabItem

4
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
public OsuTextBox NameField, MaxParticipantsField;
public RoomAvailabilityPicker AvailabilityPicker;
public GameTypePicker TypePicker;
public MatchTypePicker TypePicker;
public OsuTextBox PasswordTextBox;
public TriangleButton ApplyButton;
@ -158,7 +158,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
Spacing = new Vector2(7),
Children = new Drawable[]
{
TypePicker = new GameTypePicker
TypePicker = new MatchTypePicker
{
RelativeSizeAxes = Axes.X,
Enabled = { Value = false }