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

Update to latest framework version.

Browse Source
This commit is contained in:
Dean Herbert
2016-09-11 02:23:26 +09:00
parent e27eb996bc
commit 4a85d8627d
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -279,7 +279,7 @@ namespace osu.Game.GameModes.Menu
private MenuVisualisation vis;
private Action clickAction;
public float SizeForFlow => logo == null ? 0 : logo.ActualSize.X * logo.Scale * logoBounceContainer.Scale * 0.8f;
public float SizeForFlow => logo == null ? 0 : logo.ActualSize.X * logo.Scale.X * logoBounceContainer.Scale.X * 0.8f;
public override void Load()
{
@ -424,7 +424,7 @@ namespace osu.Game.GameModes.Menu
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Colour = colour,
VectorScale = new Vector2(0, 1)
Scale = new Vector2(0, 1)
});
iconText = new AutoSizeContainer
@ -440,7 +440,7 @@ namespace osu.Game.GameModes.Menu
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = 0.7f,
Scale = new Vector2(0.7f),
};
iconText.Add(icon);
@ -588,8 +588,8 @@ namespace osu.Game.GameModes.Menu
protected override void Update()
{
HandleInput = state != ButtonState.Exploded && box.VectorScale.X >= 0.8f;
iconText.Alpha = MathHelper.Clamp((box.VectorScale.X - 0.5f) / 0.3f, 0, 1);
HandleInput = state != ButtonState.Exploded && box.Scale.X >= 0.8f;
iconText.Alpha = MathHelper.Clamp((box.Scale.X - 0.5f) / 0.3f, 0, 1);
base.Update();
}
@ -663,7 +663,7 @@ namespace osu.Game.GameModes.Menu
Quad q = base.DrawQuad;
//Will become infinite if we don't limit its maximum size.
float wedge = Math.Min(q.Width, wedgeWidth / Scale / VectorScale.X);
float wedge = Math.Min(q.Width, wedgeWidth / Scale.X);
q.TopLeft.X += wedge;
q.BottomRight.X -= wedge;