1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 11:03:22 +08:00

Add scale adjusts to bring legacy skins in-line with lazer sizing

This commit is contained in:
Dean Herbert 2018-03-21 20:06:36 +09:00
parent fb3d319d0e
commit 4a93abcc36
2 changed files with 18 additions and 3 deletions

View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using osu.Game.Database; using osu.Game.Database;
using OpenTK;
namespace osu.Game.Skinning namespace osu.Game.Skinning
{ {
@ -35,7 +36,8 @@ namespace osu.Game.Skinning
Configuration = new SkinConfiguration(); Configuration = new SkinConfiguration();
} }
protected LegacySkin(SkinInfo skin) : base(skin) protected LegacySkin(SkinInfo skin)
: base(skin)
{ {
} }
@ -57,10 +59,22 @@ namespace osu.Game.Skinning
break; break;
} }
var texture = GetTexture(componentName); float ratio = 0.72f; // brings sizing roughly in-line with stable
var texture = GetTexture($"{componentName}@2x");
if (texture == null)
{
ratio *= 2;
GetTexture(componentName);
}
if (texture == null) return null; if (texture == null) return null;
return new Sprite { Texture = texture }; return new Sprite
{
Texture = texture,
Scale = new Vector2(ratio),
};
} }
public override Texture GetTexture(string componentName) => Textures.Get(componentName); public override Texture GetTexture(string componentName) => Textures.Get(componentName);

View File

@ -49,6 +49,7 @@ namespace osu.Game.Skinning
{ {
drawable.RelativeSizeAxes = Axes.Both; drawable.RelativeSizeAxes = Axes.Both;
drawable.Size = Vector2.One; drawable.Size = Vector2.One;
drawable.Scale = Vector2.One;
drawable.FillMode = FillMode.Fit; drawable.FillMode = FillMode.Fit;
} }
} }