sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 11:37:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

CI fixes

Browse Source
This commit is contained in:
DrabWeb 2017-05-30 22:23:00 -03:00
parent 7ba32f2021
commit a483422b44
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Online/Multiplayer/GameType.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Online.Multiplayer
{ {
public VersusRow(Color4 first, Color4 second, float size) public VersusRow(Color4 first, Color4 second, float size)
{ {
var triangle_size = new Vector2(size); var triangleSize = new Vector2(size);
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Spacing = new Vector2(2f, 0f); Spacing = new Vector2(2f, 0f);
@ -93,7 +93,7 @@ namespace osu.Game.Online.Multiplayer
{ {
new Container new Container
{ {
Size = triangle_size, Size = triangleSize,
Colour = first, Colour = first,
Children = new[] Children = new[]
{ {
@ -108,7 +108,7 @@ namespace osu.Game.Online.Multiplayer
}, },
new Container new Container
{ {
Size = triangle_size, Size = triangleSize,
Colour = second, Colour = second,
Children = new[] Children = new[]
{ {

22
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Multiplayer
{ {
public class RoomInspector : Container public class RoomInspector : Container
{ {
private readonly MarginPadding content_padding = new MarginPadding { Horizontal = 20, Vertical = 10 }; private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 };
private const float transition_duration = 100; private const float transition_duration = 100;
private const float ruleset_height = 30; private const float ruleset_height = 30;
@ -34,13 +34,13 @@ namespace osu.Game.Screens.Multiplayer
private readonly OsuSpriteText participants, participantsSlash, maxParticipants, name, status, beatmapTitle, beatmapDash, beatmapArtist, beatmapAuthor, host, levelRangeLower, levelRangeHigher; private readonly OsuSpriteText participants, participantsSlash, maxParticipants, name, status, beatmapTitle, beatmapDash, beatmapArtist, beatmapAuthor, host, levelRangeLower, levelRangeHigher;
private readonly ScrollContainer participantsScroll; private readonly ScrollContainer participantsScroll;
private Bindable<string> nameBind = new Bindable<string>(); private readonly Bindable<string> nameBind = new Bindable<string>();
private Bindable<User> hostBind = new Bindable<User>(); private readonly Bindable<User> hostBind = new Bindable<User>();
private Bindable<RoomStatus> statusBind = new Bindable<RoomStatus>(); private readonly Bindable<RoomStatus> statusBind = new Bindable<RoomStatus>();
private Bindable<GameType> typeBind = new Bindable<GameType>(); private readonly Bindable<GameType> typeBind = new Bindable<GameType>();
private Bindable<BeatmapInfo> beatmapBind = new Bindable<BeatmapInfo>(); private readonly Bindable<BeatmapInfo> beatmapBind = new Bindable<BeatmapInfo>();
private Bindable<int?> maxParticipantsBind = new Bindable<int?>(); private readonly Bindable<int?> maxParticipantsBind = new Bindable<int?>();
private Bindable<User[]> participantsBind = new Bindable<User[]>(); private readonly Bindable<User[]> participantsBind = new Bindable<User[]>();
private OsuColour colours; private OsuColour colours;
private LocalisationEngine localisation; private LocalisationEngine localisation;
@ -176,7 +176,7 @@ namespace osu.Game.Screens.Multiplayer
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Padding = content_padding, Padding = contentPadding,
Spacing = new Vector2(0f, 5f), Spacing = new Vector2(0f, 5f),
Children = new Drawable[] Children = new Drawable[]
{ {
@ -247,7 +247,7 @@ namespace osu.Game.Screens.Multiplayer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Padding = content_padding, Padding = contentPadding,
Children = new Drawable[] Children = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
@ -344,7 +344,7 @@ namespace osu.Game.Screens.Multiplayer
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Padding = new MarginPadding { Top = content_padding.Top, Left = 38, Right = 37 }, Padding = new MarginPadding { Top = contentPadding.Top, Left = 38, Right = 37 },
Children = new[] Children = new[]
{ {
participantsFlow = new FillFlowContainer participantsFlow = new FillFlowContainer