sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix post-merge errors

Browse Source
This commit is contained in:
smoogipoo
2019-01-29 21:27:32 +09:00
parent 91302ea0bc
commit b5d187c4af
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Screens.Multi.Match
{
Padding = new MarginPadding
{
Left = 10 + HORIZONTAL_OVERFLOW_PADDING,
Left = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
Right = 10,
Vertical = 10,
},
@ -84,7 +84,7 @@ namespace osu.Game.Screens.Multi.Match
Padding = new MarginPadding
{
Left = 10,
Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
Vertical = 10,
},
RelativeSizeAxes = Axes.Both,
@ -113,10 +113,10 @@ namespace osu.Game.Screens.Multi.Match
},
};
header.OnRequestSelectBeatmap = () => Push(new MatchSongSelect
header.OnRequestSelectBeatmap = () => this.Push(new MatchSongSelect
{
Selected = addPlaylistItem,
Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING }
Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING }
});
header.Tabs.Current.ValueChanged += t =>