sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +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/ModSection.cs
View File

@ -16,7 +16,7 @@ using osu.Game.Modes;
namespace osu.Game.Overlays.Mods
{
class AlwaysPresentFlowContainer : FlowContainer
class AlwaysPresentFlowContainer : FillFlowContainer
{
public override bool IsPresent => true;
}
@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Mods
private OsuSpriteText headerLabel;
private AlwaysPresentFlowContainer buttonsContainer;
public FlowContainer ButtonsContainer => buttonsContainer;
public FillFlowContainer ButtonsContainer => buttonsContainer;
public Action<Mod> Action;
protected virtual Key[] ToggleKeys => new Key[] { };