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

Scale OsuResumeCursor with gameplay cursor

Browse Source
This commit is contained in:
HoLLy-HaCKeR
2019-10-12 11:51:14 +02:00
parent 13924174c4
commit fdc17d2adb
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
View File

@ -38,7 +38,13 @@ namespace osu.Game.Rulesets.Osu.UI
clickToResumeCursor.ShowAt(GameplayCursor.ActiveCursor.Position);
if (localCursorContainer == null)
Add(localCursorContainer = new OsuCursorContainer());
{
var newContainer = new OsuCursorContainer();
Add(localCursorContainer = newContainer);
clickToResumeCursor.CursorScale = newContainer.CalculatedCursorScale.Value;
newContainer.CalculatedCursorScale.ValueChanged += e => clickToResumeCursor.CursorScale = e.NewValue;
}
}
public override void Hide()
@ -57,6 +63,8 @@ namespace osu.Game.Rulesets.Osu.UI
public Action ResumeRequested;
public float CursorScale;
public OsuClickToResumeCursor()
{
RelativePositionAxes = Axes.Both;
@ -82,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.UI
case OsuAction.RightButton:
if (!IsHovered) return false;
this.ScaleTo(new Vector2(2), TRANSITION_TIME, Easing.OutQuint);
this.ScaleTo(2 * CursorScale, TRANSITION_TIME, Easing.OutQuint);
ResumeRequested?.Invoke();
return true;
@ -97,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.UI
{
updateColour();
this.MoveTo(activeCursorPosition);
this.ScaleTo(new Vector2(4)).Then().ScaleTo(Vector2.One, 1000, Easing.OutQuint);
this.ScaleTo(4 * CursorScale).Then().ScaleTo(CursorScale, 1000, Easing.OutQuint);
});
private void updateColour()