連合艦隊表示で第一の艦娘名が第二にはみ出すのを直す

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index 60b4e0c..c085eed 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -30,6 +30,7 @@ namespace KancolleSniffer
         RepairListFull = 75,\r
         ShipList = 82,\r
         GroupConfig = 82,\r
+        Combined = 54,\r
         Max = int.MaxValue\r
     }\r
 \r
@@ -144,7 +145,7 @@ namespace KancolleSniffer
             for (var i = 0; i < _combinedLabels.Length; i++)\r
             {\r
                 var x = parentWidth / 2 * (i / ShipInfo.MemberCount);\r
-                var y = top + lh * ((i % ShipInfo.MemberCount) + 1);\r
+                var y = top + lh * (i % ShipInfo.MemberCount + 1);\r
                 parent.Controls.AddRange(_combinedLabels[i] = new[]\r
                 {\r
                     new ShipLabel {Location = new Point(x + 88, y), AutoSize = true, AnchorRight = true},\r
@@ -180,7 +181,7 @@ namespace KancolleSniffer
                     var s = statuses[idx];\r
                     labels[0].SetHp(s);\r
                     labels[1].SetCond(s);\r
-                    labels[2].SetName(s);\r
+                    labels[2].SetName(s, ShipNameWidth.Combined);\r
                 }\r
                 else\r
                 {\r