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

Merge branch 'master' into mod-overlay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
This commit is contained in:
Dean Herbert
2017-03-02 20:27:04 +09:00
parent 482be9f451 d74a601180
commit 471b9daa93
75 changed files with 860 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -21,7 +21,7 @@ using osu.Game.Modes.UI;
namespace osu.Game.Overlays.Mods
{
public class ModButton : FlowContainer
public class ModButton : FillFlowContainer
{
private ModIcon[] icons;
private ModIcon displayIcon => icons[icons.Length - 1];
@ -236,7 +236,7 @@ namespace osu.Game.Overlays.Mods
public ModButton(Mod m)
{
Direction = FlowDirections.Vertical;
Direction = FillDirection.Down;
Spacing = new Vector2(0f, -5f);
Size = new Vector2(100f);