From 2f40f5bd1969863f86930beab52e031e35efd917 Mon Sep 17 00:00:00 2001 From: tsrk Date: Thu, 15 Jun 2023 12:01:38 +0200 Subject: [PATCH] fix: change key counter position in Triangles and Legacy skins --- osu.Game/Skinning/LegacySkin.cs | 10 ++++++++++ osu.Game/Skinning/TrianglesSkin.cs | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs index e46eaf90c1..e35f8fbe4d 100644 --- a/osu.Game/Skinning/LegacySkin.cs +++ b/osu.Game/Skinning/LegacySkin.cs @@ -22,6 +22,7 @@ using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Scoring; using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD.HitErrorMeters; +using osuTK; using osuTK.Graphics; namespace osu.Game.Skinning @@ -372,12 +373,20 @@ namespace osu.Game.Skinning } var hitError = container.OfType().FirstOrDefault(); + var keyCounter = container.OfType().FirstOrDefault(); if (hitError != null) { hitError.Anchor = Anchor.BottomCentre; hitError.Origin = Anchor.CentreLeft; hitError.Rotation = -90; + + if (keyCounter != null) + { + keyCounter.Anchor = Anchor.BottomRight; + keyCounter.Origin = Anchor.BottomRight; + keyCounter.Position = new Vector2(10, -10 - hitError.Width); + } } }) { @@ -389,6 +398,7 @@ namespace osu.Game.Skinning new LegacyHealthDisplay(), new LegacySongProgress(), new BarHitErrorMeter(), + new DefaultKeyCounterDisplay() } }; } diff --git a/osu.Game/Skinning/TrianglesSkin.cs b/osu.Game/Skinning/TrianglesSkin.cs index bb562468db..424c477bda 100644 --- a/osu.Game/Skinning/TrianglesSkin.cs +++ b/osu.Game/Skinning/TrianglesSkin.cs @@ -148,7 +148,7 @@ namespace osu.Game.Skinning { keyCounter.Anchor = Anchor.BottomRight; keyCounter.Origin = Anchor.BottomRight; - keyCounter.Position = new Vector2(10, songProgress.Height + 10); + keyCounter.Position = new Vector2(10, -57 - 10); } }) {