文字列制限なしを指定した艦娘名の長さが0になるのを直す

diff --git a/KancolleSniffer.Test/ShipLabelTest.cs b/KancolleSniffer.Test/ShipLabelTest.cs
index 355f20e..389ac11 100644 (file)
--- a/KancolleSniffer.Test/ShipLabelTest.cs
+++ b/KancolleSniffer.Test/ShipLabelTest.cs
@@ -53,6 +53,18 @@ namespace KancolleSniffer.Test
             }\r
 \r
             /// <summary>\r
+            /// 文字数制限がない\r
+            /// </summary>\r
+            [TestMethod]\r
+            public void Unlimited()\r
+            {\r
+                var label = new ShipLabel.Name(Point.Empty, ShipNameWidth.Max){Parent = new Panel()};\r
+                var str = "一二三四五六七八九〇一二三四五六七八九〇一二三四五六七八九〇";\r
+                label.SetName(str);\r
+                Assert.AreEqual(str, label.Text);\r
+            }\r
+\r
+            /// <summary>\r
             /// 明石タイマー表示中の艦娘の名前を縮める\r
             /// </summary>\r
             [TestMethod]\r

diff --git a/KancolleSniffer/View/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs
index 43f58e8..c64a01d 100644 (file)
--- a/KancolleSniffer/View/ShipLabel.cs
+++ b/KancolleSniffer/View/ShipLabel.cs
@@ -143,7 +143,8 @@ namespace KancolleSniffer.View
             {\r
                 _slotStatus = slotStatus;\r
                 ChangeFont(name);\r
-                Text = prefix + StringTruncator.Truncate(name, "", Scaler.ScaleWidth((int)width), Font);\r
+                var realWidth = width == ShipNameWidth.Max ? (int)width : Scaler.ScaleWidth((int)width);\r
+                Text = prefix + StringTruncator.Truncate(name, "", realWidth, Font);\r
                 Invalidate(); // 必ずOnPaintを実行させるため\r
             }\r
 \r