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

Move paddings up one level

Browse Source
This commit is contained in:
smoogipoo 2021-08-18 15:54:33 +09:00
parent 744b6749d1
commit 90a1be2e61
2 changed files with 106 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -147,7 +147,12 @@ namespace osu.Game.Screens.OnlinePlay.Match
Colour = Color4Extensions.FromHex(@"3e3a44") // This is super temporary.
},
},
CreateMainContent(),
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(10),
Child = CreateMainContent(),
},
new Container
{
Anchor = Anchor.BottomLeft,

44
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -109,20 +109,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
}
protected override Drawable CreateMainContent() => new Container
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding
{
Horizontal = 10,
Vertical = 10
},
Child = new GridContainer
protected override Drawable CreateMainContent() => new GridContainer
{
RelativeSizeAxes = Axes.Both,
Content = new[]
@ -243,9 +230,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}
}
},
}
},
}
};
protected override Drawable CreateFooter() => new MultiplayerMatchFooter
@ -444,19 +428,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (client != null)
{
client.RoomUpdated -= onRoomUpdated;
client.LoadRequested -= onLoadRequested;
}
modSettingChangeTracker?.Dispose();
}
public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
{
if (!this.IsCurrentScreen())
@ -472,5 +443,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (client != null)
{
client.RoomUpdated -= onRoomUpdated;
client.LoadRequested -= onLoadRequested;
}
modSettingChangeTracker?.Dispose();
}
}
}