メインの要修復一覧で時間とダメージ色が表示されないのを直す

diff --git a/KancolleSniffer/View/AntiAirPanel.cs b/KancolleSniffer/View/AntiAirPanel.cs
index 8abd59b..ae4b556 100644 (file)
--- a/KancolleSniffer/View/AntiAirPanel.cs
+++ b/KancolleSniffer/View/AntiAirPanel.cs
@@ -30,7 +30,7 @@ namespace KancolleSniffer.View
             public Label Rate { get; set; }\r
             public Label Diff { get; set; }\r
 \r
-            public override Control[] Controls => base.Controls.Concat(new Control[] {Rate, Diff}).ToArray();\r
+            public override Control[] AddedControls => new Control[] {Rate, Diff};\r
         }\r
 \r
         public void Update(Sniffer sniffer)\r

diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs
index 51c1953..f73bc94 100644 (file)
--- a/KancolleSniffer/View/RepairListForMain.cs
+++ b/KancolleSniffer/View/RepairListForMain.cs
@@ -36,7 +36,7 @@ namespace KancolleSniffer.View
             public ShipLabel.RepairTime Time { private get; set; }\r
             public ShipLabel.Hp Damage { get; set; }\r
 \r
-            public override Control[] Controls => base.Controls.Concat(new Control[] {Time, Damage}).ToArray();\r
+            public override Control[] AddedControls => new Control[] {Time, Damage};\r
 \r
             public override void Set(ShipStatus status)\r
             {\r

diff --git a/KancolleSniffer/View/ShipLabels.cs b/KancolleSniffer/View/ShipLabels.cs
index ee05044..0b32002 100644 (file)
--- a/KancolleSniffer/View/ShipLabels.cs
+++ b/KancolleSniffer/View/ShipLabels.cs
@@ -28,9 +28,13 @@ namespace KancolleSniffer.View
         public ShipLabel.Exp Exp { get; set; }\r
         public Label BackGround { get; set; }\r
 \r
-        public override Control[] Controls =>\r
-            new Control[] {Hp, Cond, Level, Exp, Name, Fleet, BackGround}.Where(c => c != null)\r
-                .ToArray(); // 名前のZ-orderを下に\r
+        // Nameが長すぎる場合は他のラベルの下に隠れてほしいのでのZ-orderを下にする。\r
+        // サブクラスで追加するラベルはBackGroundで隠れないようにZ-orderを上にする。\r
+        public sealed override Control[] Controls =>\r
+            AddedControls.Concat(new Control[] {Fleet, Hp, Cond, Level, Exp, Name, BackGround}.Where(c => c != null))\r
+                .ToArray();\r
+\r
+        public virtual Control[] AddedControls => new Control[0];\r
 \r
         public virtual void Set(ShipStatus status)\r
         {\r

diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index 631de52..b601059 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -30,7 +30,7 @@ namespace KancolleSniffer.View.ShipListPanel
             public ShipLabel.RepairTime Time { get; set; }\r
             public Label PerHp { get; set; }\r
 \r
-            public override Control[] Controls => base.Controls.Concat(new[] {Time, PerHp}).ToArray();\r
+            public override Control[] AddedControls => new Control[] {Time, PerHp};\r
 \r
             public override void Set(ShipStatus status)\r
             {\r