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

Move logic out of OsuGame

Browse Source
This commit is contained in:
Dean Herbert
2019-08-13 14:38:49 +09:00
parent 8d23cda51a
commit 9aac5efa4e
4 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/OsuGame.cs
View File

@ -68,8 +68,6 @@ namespace osu.Game
private BeatmapSetOverlay beatmapSetOverlay;
private OnScreenDisplay osd;
[Cached]
private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
@ -469,7 +467,7 @@ namespace osu.Game
});
loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add);
loadComponentSingleFile(osd = new OnScreenDisplay(), Add, true);
loadComponentSingleFile(new OnScreenDisplay(), Add, true);
loadComponentSingleFile(musicController = new MusicController(), Add, true);
@ -734,27 +732,6 @@ namespace osu.Game
case GlobalAction.ToggleGameplayMouseButtons:
LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
return true;
case GlobalAction.MusicPlay:
if (!musicController.IsLoaded) return true;
if (musicController.PlayTrack())
osd.Display(new Overlays.OSD.MusicControllerToast(musicController.IsPlaying ? "Play track" : "Pause track"));
return true;
case GlobalAction.MusicNext:
if (!musicController.IsLoaded) return true;
if (musicController.NextTrack())
osd.Display(new Overlays.OSD.MusicControllerToast("Next track"));
return true;
case GlobalAction.MusicPrev:
if (!musicController.IsLoaded) return true;
if (musicController.PreviousTrack())
osd.Display(new Overlays.OSD.MusicControllerToast("Previous track"));
return true;
}
return false;