1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-11 15:52:55 +08:00

Merge pull request #8568 from peppy/fix-slider-ball-sizing

Fix weird slider ball sizing
This commit is contained in:
Dan Balasescu 2020-04-02 20:18:40 +09:00 committed by GitHub
commit ca0c8b3760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 11 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
public LegacySliderBall(Drawable animationContent)
{
this.animationContent = animationContent;
AutoSizeAxes = Axes.Both;
}
[BackgroundDependencyLoader]

View File

@ -62,17 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
// Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
if (sliderBallContent != null)
{
var size = sliderBallContent.Size;
sliderBallContent.RelativeSizeAxes = Axes.Both;
sliderBallContent.Size = Vector2.One;
return new LegacySliderBall(sliderBallContent)
{
Size = size
};
}
return new LegacySliderBall(sliderBallContent);
return null;