Merge branch 'master' into master

osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs

@@ -7,7 +7,9 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -21,6 +23,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
+                Position = new Vector2(0, 72.7f)
+            };
+
+            KeyCounterDisplay argonKc = new ArgonKeyCounterDisplay
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Position = new Vector2(0, -72.7f)
             };
 
             kc.AddRange(new InputTrigger[]
@@ -31,12 +41,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 new KeyCounterMouseTrigger(MouseButton.Right),
             });
 
+            argonKc.AddRange(new InputTrigger[]
+            {
+                new KeyCounterKeyboardTrigger(Key.X),
+                new KeyCounterKeyboardTrigger(Key.X),
+                new KeyCounterMouseTrigger(MouseButton.Left),
+                new KeyCounterMouseTrigger(MouseButton.Right),
+            });
+
             var testCounter = (DefaultKeyCounter)kc.Counters.First();
 
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));
                 kc.Add(new KeyCounterKeyboardTrigger(key));
+                argonKc.Add(new KeyCounterKeyboardTrigger(key));
             });
 
             Key testKey = ((KeyCounterKeyboardTrigger)kc.Counters.First().Trigger).Key;
@@ -55,6 +74,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses.Value == 2);
 
             Add(kc);
+            Add(argonKc);
         }
     }
 }

osu.Game/Localisation/EditorStrings.cs

@@ -100,14 +100,14 @@ namespace osu.Game.Localisation
         public static LocalisableString TimelineTicks => new TranslatableString(getKey(@"timeline_ticks"), @"Ticks");
 
         /// <summary>
-        /// "{0:0.0}&#176;"
+        /// "{0:0}&#176;"
         /// </summary>
-        public static LocalisableString RotationUnsnapped(float newRotation) => new TranslatableString(getKey(@"rotation_unsnapped"), @"{0:0.0}°", newRotation);
+        public static LocalisableString RotationUnsnapped(float newRotation) => new TranslatableString(getKey(@"rotation_unsnapped"), @"{0:0}°", newRotation);
 
         /// <summary>
-        /// "{0:0.0}&#176; (snapped)"
+        /// "{0:0}&#176; (snapped)"
         /// </summary>
-        public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0.0}° (snapped)", newRotation);
+        public static LocalisableString RotationSnapped(float newRotation) => new TranslatableString(getKey(@"rotation_snapped"), @"{0:0}° (snapped)", newRotation);
 
         private static string getKey(string key) => $@"{prefix}:{key}";
     }

osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs

@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             float oldRotation = cumulativeRotation.Value ?? 0;
 
-            float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : rawCumulativeRotation;
+            float newRotation = shouldSnap ? snap(rawCumulativeRotation, snap_step) : MathF.Round(rawCumulativeRotation);
             newRotation = (newRotation - 180) % 360 + 180;
 
             cumulativeRotation.Value = newRotation;

osu.Game/Screens/Play/ArgonKeyCounter.cs

@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonKeyCounter : KeyCounter
+    {
+        private Circle inputIndicator = null!;
+        private OsuSpriteText countText = null!;
+
+        // These values were taken from Figma
+        private const float line_height = 3;
+        private const float name_font_size = 10;
+        private const float count_font_size = 14;
+
+        // Make things look bigger without using Scale
+        private const float scale_factor = 1.5f;
+
+        public ArgonKeyCounter(InputTrigger trigger)
+            : base(trigger)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Children = new Drawable[]
+            {
+                inputIndicator = new Circle
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Height = line_height * scale_factor,
+                    Alpha = 0.5f
+                },
+                new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Position = new Vector2(0, -13) * scale_factor,
+                    Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
+                    Colour = colours.Blue0,
+                    Text = Trigger.Name
+                },
+                countText = new OsuSpriteText
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
+                },
+            };
+
+            // Values from Figma didn't match visually
+            // So these were just eyeballed
+            Height = 30 * scale_factor;
+            Width = 35 * scale_factor;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsActive.BindValueChanged(e => inputIndicator.Alpha = e.NewValue ? 1 : 0.5f, true);
+            CountPresses.BindValueChanged(e => countText.Text = e.NewValue.ToString(@"#,0"), true);
+        }
+    }
+}

osu.Game/Screens/Play/ArgonKeyCounterDisplay.cs

@@ -0,0 +1,44 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public partial class ArgonKeyCounterDisplay : KeyCounterDisplay
+    {
+        private const int duration = 100;
+
+        private readonly FillFlowContainer<ArgonKeyCounter> keyFlow;
+
+        public override IEnumerable<KeyCounter> Counters => keyFlow;
+
+        public ArgonKeyCounterDisplay()
+        {
+            InternalChild = keyFlow = new FillFlowContainer<ArgonKeyCounter>
+            {
+                Direction = FillDirection.Horizontal,
+                AutoSizeAxes = Axes.Both,
+                Alpha = 0,
+                Spacing = new Vector2(2),
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Size = keyFlow.Size;
+        }
+
+        public override void Add(InputTrigger trigger) =>
+            keyFlow.Add(new ArgonKeyCounter(trigger));
+
+        protected override void UpdateVisibility()
+            => keyFlow.FadeTo(AlwaysVisible.Value || ConfigVisibility.Value ? 1 : 0, duration);
+    }
+}

osu.Game/Screens/Play/HUD/DefaultKeyCounter.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
                     {
                         new OsuSpriteText
                         {
-                            Text = Name,
+                            Text = Trigger.Name,
                             Font = OsuFont.Numeric.With(size: 12),
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,

osu.Game/Screens/Play/HUD/KeyCounter.cs

@@ -54,8 +54,6 @@ namespace osu.Game.Screens.Play.HUD
 
             Trigger.OnActivate += Activate;
             Trigger.OnDeactivate += Deactivate;
-
-            Name = trigger.Name;
         }
 
         private void increment()