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

Merge branch 'split-out-music-controller' into music-controller-hotkeys

Browse Source
This commit is contained in:
Dean Herbert
2019-08-13 14:33:35 +09:00
parent 5dbde38a6b ad24265730
commit 8d23cda51a
7 changed files with 532 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/OsuGame.cs
View File

@ -471,6 +471,8 @@ namespace osu.Game
loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add);
loadComponentSingleFile(osd = new OnScreenDisplay(), Add, true);
loadComponentSingleFile(musicController = new MusicController(), Add, true);
loadComponentSingleFile(notifications = new NotificationOverlay
{
GetToolbarHeight = () => ToolbarOffset,
@ -497,7 +499,7 @@ namespace osu.Game
Origin = Anchor.TopRight,
}, rightFloatingOverlayContent.Add, true);
loadComponentSingleFile(musicController = new MusicController
loadComponentSingleFile(new NowPlayingOverlay
{
GetToolbarHeight = () => ToolbarOffset,
Anchor = Anchor.TopRight,