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

Merge pull request #335 from peppy/overlay-improvements

Browse Source 
Overlay improvements
This commit is contained in:
Thomas Müller
2017-02-09 08:43:58 +01:00
committed by GitHub
parent 6f45217b02 23bc84fa3c
commit b7fd65070e
6 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays
{
public class MusicController : OverlayContainer
public class MusicController : FocusedOverlayContainer
{
private MusicControllerBackground backgroundSprite;
private DragBar progress;
@ -86,6 +86,8 @@ namespace osu.Game.Overlays
{
dragContainer = new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Masking = true,
CornerRadius = 5,
EdgeEffect = new EdgeEffect
@ -388,14 +390,23 @@ namespace osu.Game.Overlays
base.Dispose(isDisposing);
}
protected override bool OnClick(InputState state) => true;
const float transition_length = 800;
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
protected override void PopIn()
{
base.PopIn();
//placeholder for toggling
protected override void PopIn() => FadeIn(100);
FadeIn(transition_length, EasingTypes.OutQuint);
dragContainer.ScaleTo(1, transition_length, EasingTypes.OutElastic);
}
protected override void PopOut() => FadeOut(100);
protected override void PopOut()
{
base.PopOut();
FadeOut(transition_length, EasingTypes.OutQuint);
dragContainer.ScaleTo(0.9f, transition_length, EasingTypes.OutQuint);
}
private enum TransformDirection { None, Next, Prev }