ShipLabel.Nameのコンストラクタで名前の横幅を指定する

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

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index 5617c40..9741b71 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -196,7 +196,7 @@ namespace KancolleSniffer.View
             {\r
                 var labels = _friendLabels[i];\r
                 var ship = friend.Main[i];\r
-                labels.Name.SetName(ship, ShipNameWidth.BattleResult);\r
+                labels.Name.Set(ship);\r
                 labels.Hp.Set(ship);\r
                 ToolTip.SetToolTip(labels.Name, GetEquipString(ship));\r
             }\r
@@ -208,7 +208,7 @@ namespace KancolleSniffer.View
                 {\r
                     var labels = _friendLabels[friend.Main.Length + 1 + i];\r
                     var ship = friend.Guard[i];\r
-                    labels.Name.SetName(ship, ShipNameWidth.BattleResult);\r
+                    labels.Name.Set(ship);\r
                     labels.Hp.Set(ship);\r
                     ToolTip.SetToolTip(labels.Name, GetEquipString(ship));\r
                 }\r
@@ -328,7 +328,7 @@ namespace KancolleSniffer.View
                 var y = LineHeight * i + 38;\r
                 var friend = new ShipLabels\r
                 {\r
-                    Name = new ShipLabel.Name(new Point(1, 2)),\r
+                    Name = new ShipLabel.Name(new Point(1, 2), ShipNameWidth.BattleResult),\r
                     Hp = new ShipLabel.Hp(new Point(101, 0), LineHeight),\r
                     BackPanel = new Panel\r
                     {\r
@@ -343,7 +343,7 @@ namespace KancolleSniffer.View
                 friend.Hp.Click += HpLabelClickHandler;\r
                 var enemy = new ShipLabels\r
                 {\r
-                    Name = new ShipLabel.Name(new Point(164, 2)),\r
+                    Name = new ShipLabel.Name(new Point(164, 2), ShipNameWidth.Max),\r
                     Hp = new ShipLabel.Hp\r
                     {\r
                         Location = new Point(119, 0),\r