ShipLabelからHPまわりをサブクラスHpに分離する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / View / BattleResultPanel.cs

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index 95d0f8f..d1e5087 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -28,7 +28,7 @@ namespace KancolleSniffer.View
         private const int LineHeight = 16;\r
         private readonly List<ShipLabels> _friendLabels = new List<ShipLabels>();\r
         private readonly List<ShipLabels> _enemyLabels = new List<ShipLabels>();\r
-        private readonly List<ShipLabel> _hpLabels = new List<ShipLabel>();\r
+        private readonly List<ShipLabel.Hp> _hpLabels = new List<ShipLabel.Hp>();\r
         private readonly BattleInfo.BattleResult[] _result = new BattleInfo.BattleResult[2];\r
         private Label _phaseLabel, _rankLabel, _supportLabel, _cellLabel;\r
         private readonly BattleResultRank[] _rank = new BattleResultRank[2];\r
@@ -331,14 +331,7 @@ namespace KancolleSniffer.View
                 var friend = new ShipLabels\r
                 {\r
                     Name = new ShipLabel {Location = new Point(1, 2), AutoSize = true},\r
-                    Hp = new ShipLabel\r
-                    {\r
-                        Location = new Point(101, 0),\r
-                        GrowLeft = true,\r
-                        MinimumSize = new Size(0, LineHeight),\r
-                        TextAlign = ContentAlignment.MiddleLeft,\r
-                        Cursor = Cursors.Hand\r
-                    },\r
+                    Hp = new ShipLabel.Hp(new Point(101, 0), LineHeight),\r
                     BackPanel = new Panel\r
                     {\r
                         Location = new Point(0, y),\r
@@ -353,7 +346,7 @@ namespace KancolleSniffer.View
                 var enemy = new ShipLabels\r
                 {\r
                     Name = new ShipLabel {Location = new Point(164, 2), AutoSize = true},\r
-                    Hp = new ShipLabel\r
+                    Hp = new ShipLabel.Hp\r
                     {\r
                         Location = new Point(119, 0),\r
                         AutoSize = true,\r