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' of git://github.com/ppy/osu into direct-previews

Browse Source
This commit is contained in:
Jorolf
2017-09-26 12:22:11 +02:00
parent 1f2a82b7ab 797e77e651
commit 355a7b6649
54 changed files with 3977 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Overlays/Direct/DirectGridPanel.cs
View File

@ -12,7 +12,6 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps;
using osu.Framework.Input;
using osu.Framework.Configuration;
namespace osu.Game.Overlays.Direct
@ -164,6 +163,15 @@ namespace osu.Game.Overlays.Direct
},
},
},
new DownloadButton
{
Size = new Vector2(30),
Margin = new MarginPadding(horizontal_padding),
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Colour = colours.Gray5,
Action = StartDownload
},
},
},
},
@ -204,11 +212,5 @@ namespace osu.Game.Overlays.Direct
if (PreviewPlaying && playButton.Track != null)
progressBar.Width = (float)(playButton.Track.CurrentTime / playButton.Track.Length);
}
protected override bool OnClick(InputState state)
{
StartDownload();
return true;
}
}
}