From 75edbadf479381db643108f24c580047dba52c2e Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 19 May 2019 21:40:22 +0900
Subject: [PATCH] =?utf8?q?ShipLabel=E3=81=8B=E3=82=89=E4=BF=AE=E5=BE=A9?=
 =?utf8?q?=E6=99=82=E9=96=93=E3=81=BE=E3=82=8F=E3=82=8A=E3=82=92=E3=82=B5?=
 =?utf8?q?=E3=83=96=E3=82=AF=E3=83=A9=E3=82=B9RepairTime=E3=81=AB=E5=88=86?=
 =?utf8?q?=E9=9B=A2=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/View/RepairListForMain.cs          |  4 +--
 KancolleSniffer/View/ShipLabel.cs                  | 39 +++++++++++++---------
 .../View/ShipListPanel/RepairListLabels.cs         |  4 +--
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs
index 01d63ac..9440e9e 100644
--- a/KancolleSniffer/View/RepairListForMain.cs
+++ b/KancolleSniffer/View/RepairListForMain.cs
@@ -34,7 +34,7 @@ namespace KancolleSniffer.View
         {
             public ShipLabel.Fleet Fleet { get; set; }
             public ShipLabel.Name Name { get; set; }
-            public ShipLabel Time { get; set; }
+            public ShipLabel.RepairTime Time { get; set; }
             public ShipLabel.Hp Damage { get; set; }
             public Label BackGround { private get; set; }
 
@@ -54,7 +54,7 @@ namespace KancolleSniffer.View
                     Fleet = new ShipLabel.Fleet(new Point(0, y)),
                     Name = new ShipLabel.Name(new Point(9, y)),
                     Damage = new ShipLabel.Hp {Location = new Point(119, y), Size = new Size(5, height - 1)},
-                    Time = new ShipLabel {Location = new Point(75, y), AutoSize = true},
+                    Time = new ShipLabel.RepairTime(new Point(75, y)),
                     BackGround = new Label
                     {
                         Location = new Point(0, y - 1),
diff --git a/KancolleSniffer/View/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs
index d2c1459..1f32297 100644
--- a/KancolleSniffer/View/ShipLabel.cs
+++ b/KancolleSniffer/View/ShipLabel.cs
@@ -47,21 +47,6 @@ namespace KancolleSniffer.View
             UseMnemonic = false;
         }
 
-        public void SetRepairTime(ShipStatus status)
-        {
-            if (status == null)
-            {
-                Text = "";
-                return;
-            }
-            SetRepairTime(status.RepairTime);
-        }
-
-        public void SetRepairTime(TimeSpan span)
-        {
-            Text = $@"{(int)span.TotalHours:d2}:{span:mm\:ss}";
-        }
-
         public new sealed class Name : ShipLabel
         {
             private SlotStatus _slotStatus;
@@ -360,5 +345,29 @@ namespace KancolleSniffer.View
                 Text = status?.Fleet == null ? "" : new[] {"1", "2", "3", "4"}[status.Fleet.Number];
             }
         }
+
+        public sealed class RepairTime : ShipLabel
+        {
+            public RepairTime(Point location)
+            {
+                Location = location;
+                AutoSize = true;
+            }
+
+            public void SetRepairTime(ShipStatus status)
+            {
+                if (status == null)
+                {
+                    Text = "";
+                    return;
+                }
+                SetRepairTime(status.RepairTime);
+            }
+
+            public void SetRepairTime(TimeSpan span)
+            {
+                Text = $@"{(int)span.TotalHours:d2}:{span:mm\:ss}";
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index 4a37a5e..c06e42a 100644
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -26,7 +26,7 @@ namespace KancolleSniffer.View.ShipListPanel
 
         private class RepairLabels : ShipLabels
         {
-            public ShipLabel Time { get; set; }
+            public ShipLabel.RepairTime Time { get; set; }
             public Label PerHp { get; set; }
 
             public override Control[] Controls => base.Controls.Concat(new[] {Time, PerHp}).ToArray();
@@ -47,7 +47,7 @@ namespace KancolleSniffer.View.ShipListPanel
                 Name = new ShipLabel.Name(new Point(10, 2)),
                 Hp = new ShipLabel.Hp(new Point(118, 0), ShipListPanel.LineHeight),
                 Level = new ShipLabel.Level(new Point(116, 2), height),
-                Time = new ShipLabel {Location = new Point(141, 2), AutoSize = true},
+                Time = new ShipLabel.RepairTime(new Point(141, 2)),
                 PerHp = new Label {Location = new Point(186, 2), AutoSize = true},
                 BackPanel = new Panel
                 {
-- 
2.11.0