From e7b79626d8016146408136823be56f45827d9391 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 8 Jul 2018 22:51:01 +0900
Subject: [PATCH] =?utf8?q?=E8=89=A6=E5=A8=98=E5=90=8D=E3=81=AE=E6=A8=AA?=
 =?utf8?q?=E5=B9=85=E3=82=92=E6=A0=B9=E6=8B=A0=E3=82=92=E6=98=8E=E7=A4=BA?=
 =?utf8?q?=E3=81=97=E3=81=9F=E4=B8=8A=E3=81=A7=E5=BE=AE=E8=AA=BF=E7=AF=80?=
 =?utf8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/BattleResultPanel.cs |  2 +-
 KancolleSniffer/MainFormLabels.cs    | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/KancolleSniffer/BattleResultPanel.cs b/KancolleSniffer/BattleResultPanel.cs
index 07b1412..4a3b6f0 100644
--- a/KancolleSniffer/BattleResultPanel.cs
+++ b/KancolleSniffer/BattleResultPanel.cs
@@ -362,7 +362,7 @@ namespace KancolleSniffer
                 {
                     new ShipLabel
                     {
-                        Location = new Point(100, 0),
+                        Location = new Point(101, 0),
                         AutoSize = true,
                         AnchorRight = true,
                         MinimumSize = new Size(0, LineHeight),
diff --git a/KancolleSniffer/MainFormLabels.cs b/KancolleSniffer/MainFormLabels.cs
index 28f0f2a..d4c23e2 100644
--- a/KancolleSniffer/MainFormLabels.cs
+++ b/KancolleSniffer/MainFormLabels.cs
@@ -20,18 +20,23 @@ using static System.Math;
 
 namespace KancolleSniffer
 {
+    /// <summary>
+    /// 艦娘名の横幅
+    /// 艦娘名のラベルのZ-orderは最下なので名前が長すぎると右隣のラベルの下に隠れるが、
+    /// 空装備マークはラベルの右端に表示するので右端が見えるように縮める必要がある。
+    /// </summary>
     public enum ShipNameWidth
     {
-        MainPanel = 93,
-        AkashiTimer = 53,
-        NDock = 69,
-        RepairList = NDock,
-        RepairListFull = 75,
-        ShipList = 82,
-        GroupConfig = 82,
-        Combined = 54,
-        BattleResult = 65,
-        CiShipName = 65,
+        MainPanel = 92, // 左端2 HP右端129幅35 129-2-35=92
+        AkashiTimer = 53, // 左端2 タイマー左端55 55-2=53 漢字4文字
+        NDock = 65, // 左端29 終了時刻右端138幅47 138-47-29=62 空装備マークなし漢字5文字65
+        RepairList = 65, // 左端9 時間左端75 75-9=66 漢字5文字65
+        RepairListFull = 73, // 左端10 HP右端118幅35 118-10-35=73
+        ShipList = 81, // 左端10 HP右端126幅35 126-10-35=81
+        GroupConfig = 80, // 左端10 レベル左端90 90-10=80
+        Combined = 53, // 左端2 HP右端88幅35 88-2-35=51 空装備マーク犠牲 漢字4文字53
+        BattleResult = 65, // 左端2 HP右端101幅35 101-1-35=65
+        CiShipName = 65, // 左端168幅236 236-168=68 漢字5文字65
         Max = int.MaxValue
     }
 
-- 
2.11.0