ShipLabelから修復時間まわりをサブクラスRepairTimeに分離する

diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs
index 01d63ac..9440e9e 100644 (file)
--- a/KancolleSniffer/View/RepairListForMain.cs
+++ b/KancolleSniffer/View/RepairListForMain.cs
@@ -34,7 +34,7 @@ namespace KancolleSniffer.View
         {\r
             public ShipLabel.Fleet Fleet { get; set; }\r
             public ShipLabel.Name Name { get; set; }\r
-            public ShipLabel Time { get; set; }\r
+            public ShipLabel.RepairTime Time { get; set; }\r
             public ShipLabel.Hp Damage { get; set; }\r
             public Label BackGround { private get; set; }\r
 \r
@@ -54,7 +54,7 @@ namespace KancolleSniffer.View
                     Fleet = new ShipLabel.Fleet(new Point(0, y)),\r
                     Name = new ShipLabel.Name(new Point(9, y)),\r
                     Damage = new ShipLabel.Hp {Location = new Point(119, y), Size = new Size(5, height - 1)},\r
-                    Time = new ShipLabel {Location = new Point(75, y), AutoSize = true},\r
+                    Time = new ShipLabel.RepairTime(new Point(75, y)),\r
                     BackGround = new Label\r
                     {\r
                         Location = new Point(0, y - 1),\r

diff --git a/KancolleSniffer/View/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs
index d2c1459..1f32297 100644 (file)
--- a/KancolleSniffer/View/ShipLabel.cs
+++ b/KancolleSniffer/View/ShipLabel.cs
@@ -47,21 +47,6 @@ namespace KancolleSniffer.View
             UseMnemonic = false;\r
         }\r
 \r
-        public void SetRepairTime(ShipStatus status)\r
-        {\r
-            if (status == null)\r
-            {\r
-                Text = "";\r
-                return;\r
-            }\r
-            SetRepairTime(status.RepairTime);\r
-        }\r
-\r
-        public void SetRepairTime(TimeSpan span)\r
-        {\r
-            Text = $@"{(int)span.TotalHours:d2}:{span:mm\:ss}";\r
-        }\r
-\r
         public new sealed class Name : ShipLabel\r
         {\r
             private SlotStatus _slotStatus;\r
@@ -360,5 +345,29 @@ namespace KancolleSniffer.View
                 Text = status?.Fleet == null ? "" : new[] {"1", "2", "3", "4"}[status.Fleet.Number];\r
             }\r
         }\r
+\r
+        public sealed class RepairTime : ShipLabel\r
+        {\r
+            public RepairTime(Point location)\r
+            {\r
+                Location = location;\r
+                AutoSize = true;\r
+            }\r
+\r
+            public void SetRepairTime(ShipStatus status)\r
+            {\r
+                if (status == null)\r
+                {\r
+                    Text = "";\r
+                    return;\r
+                }\r
+                SetRepairTime(status.RepairTime);\r
+            }\r
+\r
+            public void SetRepairTime(TimeSpan span)\r
+            {\r
+                Text = $@"{(int)span.TotalHours:d2}:{span:mm\:ss}";\r
+            }\r
+        }\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
index 4a37a5e..c06e42a 100644 (file)
--- a/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/RepairListLabels.cs
@@ -26,7 +26,7 @@ namespace KancolleSniffer.View.ShipListPanel
 \r
         private class RepairLabels : ShipLabels\r
         {\r
-            public ShipLabel Time { get; set; }\r
+            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
@@ -47,7 +47,7 @@ namespace KancolleSniffer.View.ShipListPanel
                 Name = new ShipLabel.Name(new Point(10, 2)),\r
                 Hp = new ShipLabel.Hp(new Point(118, 0), ShipListPanel.LineHeight),\r
                 Level = new ShipLabel.Level(new Point(116, 2), height),\r
-                Time = new ShipLabel {Location = new Point(141, 2), AutoSize = true},\r
+                Time = new ShipLabel.RepairTime(new Point(141, 2)),\r
                 PerHp = new Label {Location = new Point(186, 2), AutoSize = true},\r
                 BackPanel = new Panel\r
                 {\r