From d6030891a24104dd33e6caf3fc708a1ebc516948 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 16 Oct 2022 10:06:38 -0700
Subject: [PATCH] Reuse existing code in hit error bar fix

Use `UprightAspectMaintainingContainer` instead of a local fix for
hit error bar orientation
---
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 9687952fff..60da967085 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -273,45 +274,74 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                     break;
 
                 case LabelStyles.Icons:
-                    labelEarly = new SpriteIcon
+                    labelEarly = new UprightAspectMaintainingContainer
                     {
-                        Y = -10,
-                        Size = new Vector2(icon_size),
-                        Icon = FontAwesome.Solid.ShippingFast,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.Centre,
+                        Y = -10,
+                        Children = new Drawable[]
+                        {
+                            new SpriteIcon
+                            {
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.ShippingFast,
+                            }
+                        }
                     };
 
-                    labelLate = new SpriteIcon
+                    labelLate = new UprightAspectMaintainingContainer
                     {
-                        Y = 10,
-                        Size = new Vector2(icon_size),
-                        Icon = FontAwesome.Solid.Bicycle,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.Centre,
+                        Y = 10,
+                        Children = new Drawable[]
+                        {
+                            new SpriteIcon
+                            {
+                                Y = 10,
+                                Size = new Vector2(icon_size),
+                                Icon = FontAwesome.Solid.Bicycle,
+                            }
+                        }
                     };
 
                     break;
 
                 case LabelStyles.Text:
-                    labelEarly = new OsuSpriteText
+                    labelEarly = new UprightAspectMaintainingContainer
                     {
-                        Y = -10,
-                        Text = "Early",
-                        Font = OsuFont.Default.With(size: 10),
-                        Height = 12,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.Centre,
+                        Y = -10,
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = "Early",
+                                Font = OsuFont.Default.With(size: 10),
+                                Height = 12,
+                            }
+                        }
                     };
 
-                    labelLate = new OsuSpriteText
+                    labelLate = new UprightAspectMaintainingContainer
                     {
-                        Y = 10,
-                        Text = "Late",
-                        Font = OsuFont.Default.With(size: 10),
-                        Height = 12,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.Centre,
+                        Y = 10,
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = "Late",
+                                Font = OsuFont.Default.With(size: 10),
+                                Height = 12,
+                            }
+                        }
                     };
 
                     break;
@@ -333,33 +363,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            // undo any layout rotation to display icons in the correct orientation
-            bool xFlipped = Scale.X < 0;
-            bool yFlipped = Scale.Y < 0;
-            bool horizontal = Rotation == 90 || Rotation == -90;
-
-            bool flipX = (xFlipped && yFlipped) || (xFlipped && !horizontal) || (yFlipped && horizontal);
-            bool flipY = (xFlipped && yFlipped) || (xFlipped && horizontal) || (yFlipped && !horizontal);
-
-            Vector2 flipScale = new Vector2(flipX ? -1 : 1, flipY ? -1 : 1);
-
-            if (labelEarly != null)
-            {
-                labelEarly.Rotation = -Rotation;
-                labelEarly.Scale = flipScale;
-            }
-
-            if (labelLate != null)
-            {
-                labelLate.Rotation = -Rotation;
-                labelLate.Scale = flipScale;
-            }
-        }
-
         private void createColourBars((HitResult result, double length)[] windows)
         {
             // max to avoid div-by-zero.