h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 21:02:59 +08:00
Code Issues Releases Wiki Activity

Clean up remaining assignments of logo relativePositionAxes

Browse Source
This commit is contained in:
David Zhao 2019-04-04 11:28:36 +09:00
parent 6b5458a625
commit 15b2b6af7d
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs
View File

@ -170,7 +170,6 @@ namespace osu.Game.Tests.Visual
AddStep("Perform logo movements", () => AddStep("Perform logo movements", () =>
{ {
facadeContainer.Tracking = false; facadeContainer.Tracking = false;
logo.RelativePositionAxes = Axes.Both;
logo.MoveTo(new Vector2(0.5f), 500, Easing.InOutExpo); logo.MoveTo(new Vector2(0.5f), 500, Easing.InOutExpo);
facadeContainer.SetLogo(logo, 1.0f, 1000, Easing.InOutExpo); facadeContainer.SetLogo(logo, 1.0f, 1000, Easing.InOutExpo);
visualBox.Colour = Color4.White; visualBox.Colour = Color4.White;

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -276,8 +276,6 @@ namespace osu.Game.Screens.Menu
game?.Toolbar.Hide(); game?.Toolbar.Hide();
logo.ClearTransforms(targetMember: nameof(Position)); logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both;
logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo); logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
logo.ScaleTo(1, 800, Easing.OutExpo); logo.ScaleTo(1, 800, Easing.OutExpo);
}, buttonArea.Alpha * 150); }, buttonArea.Alpha * 150);

5
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -131,12 +131,9 @@ namespace osu.Game.Screens.Play
private void contentOut() private void contentOut()
{ {
// Ensure the logo is no longer tracking before we scale the content, and that its RelativePositionAxes have been returned. // Ensure the logo is no longer tracking before we scale the content
content.Tracking = false; content.Tracking = false;
if (logo != null)
logo.RelativePositionAxes = Axes.Both;
content.ScaleTo(0.7f, 300, Easing.InQuint); content.ScaleTo(0.7f, 300, Easing.InQuint);
content.FadeOut(250); content.FadeOut(250);
} }