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

Update overlay containers in lines with framework changes.

Browse Source 
Allows closing the MusicController using escape.
This commit is contained in:
Dean Herbert 2017-02-09 12:46:53 +09:00
parent 2e5ad31cc7
commit 18bb61897f
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -19,6 +19,8 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
private VolumeMeter volumeMeterMaster; private VolumeMeter volumeMeterMaster;
protected override bool HideOnEscape => false;
private void volumeChanged(object sender, EventArgs e) private void volumeChanged(object sender, EventArgs e)
{ {
Show(); Show();

4
osu.Game/Overlays/MusicController.cs
View File

@ -374,10 +374,6 @@ namespace osu.Game.Overlays
base.Dispose(isDisposing); base.Dispose(isDisposing);
} }
protected override bool OnClick(InputState state) => true;
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
//placeholder for toggling //placeholder for toggling
protected override void PopIn() => FadeIn(100); protected override void PopIn() => FadeIn(100);

3
osu.Game/Overlays/Pause/PauseOverlay.cs
View File

@ -22,6 +22,8 @@ namespace osu.Game.Overlays.Pause
private const int button_height = 70; private const int button_height = 70;
private const float background_alpha = 0.75f; private const float background_alpha = 0.75f;
protected override bool HideOnEscape => false;
public Action OnResume; public Action OnResume;
public Action OnRetry; public Action OnRetry;
public Action OnQuit; public Action OnQuit;
@ -83,6 +85,7 @@ namespace osu.Game.Overlays.Pause
resume(); resume();
return true; return true;
} }
return base.OnKeyDown(state, args); return base.OnKeyDown(state, args);
} }

4
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -24,6 +24,10 @@ namespace osu.Game.Overlays.Toolbar
private ToolbarModeSelector modeSelector; private ToolbarModeSelector modeSelector;
private ToolbarUserArea userArea; private ToolbarUserArea userArea;
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughInput => false;
private const int transition_time = 500; private const int transition_time = 500;
private const float alpha_hovering = 0.8f; private const float alpha_hovering = 0.8f;