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 'refs/heads/master' into more-sound-effects

Browse Source
This commit is contained in:
Dean Herbert
2016-12-06 00:08:45 +09:00
parent 7bd9a87bda e33aaa95a8
commit ef8793ff24
5 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Graphics/UserInterface/BackButton.cs
View File

@ -19,13 +19,10 @@ namespace osu.Game.Graphics.UserInterface
{
private TextAwesome icon;
private Container leftContainer;
private Container rightContainer;
private Box leftBox;
private Box rightBox;
private const double transform_time = 300.0;
private const double transform_time = 600;
private const int pulse_length = 250;
private const float shear = 0.1f;
@ -40,7 +37,7 @@ namespace osu.Game.Graphics.UserInterface
Children = new Drawable[]
{
leftContainer = new Container
new Container
{
RelativeSizeAxes = Axes.Both,
Width = 0.4f,
@ -60,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
},
}
},
rightContainer = new Container
new Container
{
Origin = Anchor.TopRight,
Anchor = Anchor.TopRight,
@ -88,10 +85,7 @@ namespace osu.Game.Graphics.UserInterface
};
}
public override bool Contains(Vector2 screenSpacePos)
{
return leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos);
}
public override bool Contains(Vector2 screenSpacePos) => leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos);
protected override bool OnHover(InputState state)
{