mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 10:33:30 +08:00
Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
This commit is contained in:
parent
efad9b3150
commit
9473f6d3e3
@ -101,11 +101,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
|
||||
},
|
||||
},
|
||||
}
|
||||
})
|
||||
}, confineMode: ConfineMode.NoScaling)
|
||||
{
|
||||
Origin = Anchor.Centre,
|
||||
Anchor = Anchor.Centre,
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.UI
|
||||
Anchor = Anchor.Centre;
|
||||
Origin = Anchor.Centre;
|
||||
|
||||
Size = new Vector2(0.75f);
|
||||
Size = new Vector2(0.8f);
|
||||
|
||||
InternalChild = new Container
|
||||
{
|
||||
|
@ -95,7 +95,6 @@ namespace osu.Game.Skinning
|
||||
public override Texture GetTexture(string componentName)
|
||||
{
|
||||
float ratio = 2;
|
||||
|
||||
var texture = Textures.Get($"{componentName}@2x");
|
||||
|
||||
if (texture == null)
|
||||
@ -105,7 +104,19 @@ namespace osu.Game.Skinning
|
||||
}
|
||||
|
||||
if (texture != null)
|
||||
texture.ScaleAdjust = ratio / 0.72f; // brings sizing roughly in-line with stable
|
||||
{
|
||||
texture.ScaleAdjust = ratio;
|
||||
|
||||
switch (componentName)
|
||||
{
|
||||
case "cursormiddle":
|
||||
case "cursortrail":
|
||||
case "cursor":
|
||||
// apply inverse of adjustment in OsuPlayfieldAdjustmentContainer for non-gameplay-scale textures.
|
||||
texture.ScaleAdjust *= 1.6f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return texture;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user