h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 02:17:46 +08:00
Code Issues Releases Wiki Activity

Improve positioning and positioning code clarity for argon / triangles implementations

Browse Source
This commit is contained in:
Dean Herbert 2023-06-26 16:20:51 +09:00
parent ba7f472247
commit 52fdeeb491
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Skinning/ArgonSkin.cs
View File

@ -168,14 +168,19 @@ namespace osu.Game.Skinning
if (songProgress != null) if (songProgress != null)
{ {
songProgress.Position = new Vector2(0, -10); const float padding = 10;
songProgress.Position = new Vector2(0, -padding);
songProgress.Scale = new Vector2(0.9f, 1); songProgress.Scale = new Vector2(0.9f, 1);
if (keyCounter != null) if (keyCounter != null && hitError != null)
{ {
// Hard to find this at runtime, so taken from the most expanded state during replay.
const float song_progress_offset_height = 36 + padding;
keyCounter.Anchor = Anchor.BottomLeft; keyCounter.Anchor = Anchor.BottomLeft;
keyCounter.Origin = Anchor.BottomLeft; keyCounter.Origin = Anchor.BottomLeft;
keyCounter.Position = new Vector2(50, -57); keyCounter.Position = new Vector2(hitError.Width + padding, -(padding * 2 + song_progress_offset_height));
} }
} }
} }

5
osu.Game/Skinning/TrianglesSkin.cs
View File

@ -148,9 +148,12 @@ namespace osu.Game.Skinning
{ {
const float padding = 10; const float padding = 10;
// Hard to find this at runtime, so taken from the most expanded state during replay.
const float song_progress_offset_height = 73;
keyCounter.Anchor = Anchor.BottomRight; keyCounter.Anchor = Anchor.BottomRight;
keyCounter.Origin = Anchor.BottomRight; keyCounter.Origin = Anchor.BottomRight;
keyCounter.Position = new Vector2(-padding, -(60 + padding)); keyCounter.Position = new Vector2(-padding, -(song_progress_offset_height + padding));
} }
}) })
{ {