From 3ecb99462fce3ac20e5e3aefd5bc909de6c99a81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:07:18 +0900
Subject: [PATCH] Make note height scale by minimum column width

---
 osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs    | 10 ++++++++--
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs      |  9 +++++++++
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs     |  3 ++-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs            |  4 ++++
 osu.Game/Skinning/LegacySkin.cs                        |  3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
index d2ceb06d0b..85523ae3c0 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyNotePiece.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         private Container directionContainer;
         private Sprite noteSprite;
 
+        private float? minimumColumnWidth;
+
         public LegacyNotePiece()
         {
             RelativeSizeAxes = Axes.X;
@@ -29,6 +31,8 @@ namespace osu.Game.Rulesets.Mania.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, IScrollingInfo scrollingInfo)
         {
+            minimumColumnWidth = skin.GetConfig<ManiaSkinConfigurationLookup, float>(new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.MinimumColumnWidth))?.Value;
+
             InternalChild = directionContainer = new Container
             {
                 Origin = Anchor.BottomCentre,
@@ -47,8 +51,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             if (noteSprite.Texture != null)
             {
-                var scale = DrawWidth / noteSprite.Texture.DisplayWidth;
-                noteSprite.Scale = new Vector2(scale);
+                // The height is scaled to the minimum column width, if provided.
+                float minimumWidth = minimumColumnWidth ?? DrawWidth;
+
+                noteSprite.Scale = Vector2.Divide(new Vector2(DrawWidth, minimumWidth), noteSprite.Texture.DisplayWidth);
             }
         }
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index ac257b8c80..08b3b8ff5a 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osuTK.Graphics;
 
@@ -45,5 +46,13 @@ namespace osu.Game.Skinning
             ColumnLineWidth.AsSpan().Fill(2);
             ColumnWidth.AsSpan().Fill(DEFAULT_COLUMN_SIZE);
         }
+
+        private float? minimumColumnWidth;
+
+        public float MinimumColumnWidth
+        {
+            get => minimumColumnWidth ?? ColumnWidth.Min();
+            set => minimumColumnWidth = value;
+        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index 853d07c060..588e9e3ee2 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Skinning
         HoldNoteBodyImage,
         ExplosionImage,
         ExplosionScale,
-        ColumnLineColour
+        ColumnLineColour,
+        MinimumColumnWidth
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index eb90225d1c..4fe36c2239 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -106,6 +106,10 @@ namespace osu.Game.Skinning
                     case "LightingNWidth":
                         parseArrayValue(pair.Value, currentConfig.ExplosionWidth);
                         break;
+
+                    case "WidthForNoteHeightScale":
+                        currentConfig.MinimumColumnWidth = float.Parse(pair.Value, CultureInfo.InvariantCulture) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        break;
                 }
             }
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3d3eac97f6..d5ef5220cf 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -207,6 +207,9 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.ColumnLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourColumnLine"));
+
+                case LegacyManiaSkinConfigurationLookups.MinimumColumnWidth:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.MinimumColumnWidth));
             }
 
             return null;