From a483422b44e430162a505c9fcea698a9f94c52c3 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Tue, 30 May 2017 22:23:00 -0300 Subject: [PATCH] CI fixes --- osu.Game/Online/Multiplayer/GameType.cs | 6 ++--- osu.Game/Screens/Multiplayer/RoomInspector.cs | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/osu.Game/Online/Multiplayer/GameType.cs b/osu.Game/Online/Multiplayer/GameType.cs index 0b9633a752..2f4c92d289 100644 --- a/osu.Game/Online/Multiplayer/GameType.cs +++ b/osu.Game/Online/Multiplayer/GameType.cs @@ -85,7 +85,7 @@ namespace osu.Game.Online.Multiplayer { public VersusRow(Color4 first, Color4 second, float size) { - var triangle_size = new Vector2(size); + var triangleSize = new Vector2(size); AutoSizeAxes = Axes.Both; Spacing = new Vector2(2f, 0f); @@ -93,7 +93,7 @@ namespace osu.Game.Online.Multiplayer { new Container { - Size = triangle_size, + Size = triangleSize, Colour = first, Children = new[] { @@ -108,7 +108,7 @@ namespace osu.Game.Online.Multiplayer }, new Container { - Size = triangle_size, + Size = triangleSize, Colour = second, Children = new[] { diff --git a/osu.Game/Screens/Multiplayer/RoomInspector.cs b/osu.Game/Screens/Multiplayer/RoomInspector.cs index 6b68c396c9..fc4c1e1159 100644 --- a/osu.Game/Screens/Multiplayer/RoomInspector.cs +++ b/osu.Game/Screens/Multiplayer/RoomInspector.cs @@ -24,7 +24,7 @@ namespace osu.Game.Screens.Multiplayer { 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 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 ScrollContainer participantsScroll; - private Bindable nameBind = new Bindable(); - private Bindable hostBind = new Bindable(); - private Bindable statusBind = new Bindable(); - private Bindable typeBind = new Bindable(); - private Bindable beatmapBind = new Bindable(); - private Bindable maxParticipantsBind = new Bindable(); - private Bindable participantsBind = new Bindable(); + private readonly Bindable nameBind = new Bindable(); + private readonly Bindable hostBind = new Bindable(); + private readonly Bindable statusBind = new Bindable(); + private readonly Bindable typeBind = new Bindable(); + private readonly Bindable beatmapBind = new Bindable(); + private readonly Bindable maxParticipantsBind = new Bindable(); + private readonly Bindable participantsBind = new Bindable(); private OsuColour colours; private LocalisationEngine localisation; @@ -176,7 +176,7 @@ namespace osu.Game.Screens.Multiplayer RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, Direction = FillDirection.Vertical, - Padding = content_padding, + Padding = contentPadding, Spacing = new Vector2(0f, 5f), Children = new Drawable[] { @@ -247,7 +247,7 @@ namespace osu.Game.Screens.Multiplayer { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Padding = content_padding, + Padding = contentPadding, Children = new Drawable[] { new FillFlowContainer @@ -344,7 +344,7 @@ namespace osu.Game.Screens.Multiplayer Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft, 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[] { participantsFlow = new FillFlowContainer