From 2ddea018cfe443bd82a2f72cd0320dd1bef001af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 8 Apr 2020 17:15:59 +0900
Subject: [PATCH] Fix hidden notes due to 0 minimum width

---
 .../Resources/mania-skin-zero-minwidth.ini        |  4 ++++
 .../Skins/LegacyManiaSkinDecoderTest.cs           | 15 +++++++++++++++
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini

diff --git a/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini b/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini
new file mode 100644
index 0000000000..fd22e2e299
--- /dev/null
+++ b/osu.Game.Tests/Resources/mania-skin-zero-minwidth.ini
@@ -0,0 +1,4 @@
+[Mania]
+Keys: 4
+ColumnWidth: 10,10,10,10
+WidthForNoteHeightScale: 0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
index 83fd4878aa..e811979aed 100644
--- a/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacyManiaSkinDecoderTest.cs
@@ -99,5 +99,20 @@ namespace osu.Game.Tests.Skins
                 Assert.That(configs[0].CustomColours, Contains.Key("ColourBarline").And.ContainValue(new Color4(50, 50, 50, 50)));
             }
         }
+
+        [Test]
+        public void TestMinimumColumnWidthFallsBackWhenZeroIsProvided()
+        {
+            var decoder = new LegacyManiaSkinDecoder();
+
+            using (var resStream = TestResources.OpenResource("mania-skin-zero-minwidth.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var configs = decoder.Decode(stream);
+
+                Assert.That(configs.Count, Is.EqualTo(1));
+                Assert.That(configs[0].MinimumColumnWidth, Is.EqualTo(16));
+            }
+        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index af7d6007f3..fb591969fb 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Skinning
         public float MinimumColumnWidth
         {
             get => minimumColumnWidth ?? ColumnWidth.Min();
-            set => minimumColumnWidth = value;
+            set => minimumColumnWidth = value > 0 ? (float?)value : null;
         }
     }
 }