戦況のレイアウトをさらに見直す

diff --git a/KancolleSniffer/BattleResultPanel.cs b/KancolleSniffer/BattleResultPanel.cs
index e65995b..a094e95 100644 (file)
--- a/KancolleSniffer/BattleResultPanel.cs
+++ b/KancolleSniffer/BattleResultPanel.cs
@@ -165,11 +165,9 @@ namespace KancolleSniffer
             SuspendLayout();\r
             var friend = result.Friend;\r
             var enemy = result.Enemy;\r
-            var fleet = new[] {"第一", "第二", "第三", "第四"};\r
-            _friendLabels[0][1].Text = fleet[friend.Main[0].Fleet];\r
             for (var i = 0; i < friend.Main.Length; i++)\r
             {\r
-                var labels = _friendLabels[i + 1];\r
+                var labels = _friendLabels[i];\r
                 var ship = friend.Main[i];\r
                 labels[0].SetHp(ship);\r
                 labels[1].SetName(ship, ShipNameWidth.BattleResult);\r
@@ -177,27 +175,26 @@ namespace KancolleSniffer
             }\r
             if (friend.Guard.Length > 0)\r
             {\r
-                _friendLabels[friend.Main.Length + 1][1].Text = fleet[friend.Guard[0].Fleet];\r
-                _friendLabels[friend.Main.Length + 1][0].SetHp(null);\r
+                _friendLabels[friend.Main.Length][1].Text = "護衛";\r
+                _friendLabels[friend.Main.Length][0].SetHp(null);\r
                 for (var i = 0; i < friend.Guard.Length; i++)\r
                 {\r
-                    var labels = _friendLabels[friend.Main.Length + 2 + i];\r
+                    var labels = _friendLabels[friend.Main.Length + 1 + i];\r
                     var ship = friend.Guard[i];\r
                     labels[0].SetHp(ship);\r
                     labels[1].SetName(ship, ShipNameWidth.BattleResult);\r
                     _toolTip.SetToolTip(labels[1], GetEqipString(ship));\r
                 }\r
             }\r
-            var friendLines = 1 + friend.Main.Length + (friend.Guard.Length > 0 ? friend.Guard.Length + 1 : 0);\r
+            var friendLines = friend.Main.Length + (friend.Guard.Length > 0 ? friend.Guard.Length + 1 : 0);\r
             for (var i = friendLines; i < _friendLabels.Count; i++)\r
             {\r
                 _friendLabels[i][0].SetHp(null);\r
                 _friendLabels[i][1].SetName("");\r
             }\r
-            _enemyLabels[0][1].Text = "本隊";\r
             for (var i = 0; i < enemy.Main.Length; i++)\r
             {\r
-                var labels = _enemyLabels[i + 1];\r
+                var labels = _enemyLabels[i];\r
                 var ship = enemy.Main[i];\r
                 labels[0].SetHp(ship);\r
                 labels[1].SetName(ShortenName(ship.Name));\r
@@ -205,11 +202,11 @@ namespace KancolleSniffer
             }\r
             if (enemy.Guard.Length > 0)\r
             {\r
-                _enemyLabels[enemy.Main.Length + 1][0].SetHp(null);\r
-                _enemyLabels[enemy.Main.Length + 1][1].Text = "護衛";\r
+                _enemyLabels[enemy.Main.Length][1].Text = "護衛";\r
+                _enemyLabels[enemy.Main.Length][0].SetHp(null);\r
                 for (var i = 0; i < enemy.Guard.Length; i++)\r
                 {\r
-                    var labels = _enemyLabels[enemy.Main.Length + 2 + i];\r
+                    var labels = _enemyLabels[enemy.Main.Length + 1 + i];\r
                     var ship = enemy.Guard[i];\r
                     labels[0].SetHp(ship);\r
                     labels[1].SetName(ShortenName(ship.Name));\r
@@ -217,7 +214,7 @@ namespace KancolleSniffer
                         string.Join("\r\n", ship.Slot.Select(item => item.Spec.Name)));\r
                 }\r
             }\r
-            var enemyLines = 1 + enemy.Main.Length + (enemy.Guard.Length > 0 ? enemy.Guard.Length + 1 : 0);\r
+            var enemyLines = enemy.Main.Length + (enemy.Guard.Length > 0 ? enemy.Guard.Length + 1 : 0);\r
             for (var i = enemyLines; i < _enemyLabels.Count; i++)\r
             {\r
                 _enemyLabels[i][0].SetHp(null);\r
@@ -240,7 +237,9 @@ namespace KancolleSniffer
                 _enemyLabels[0][1].Location.X + _enemyLabels.Max(labels => labels[1].Size.Width) - 1); // 敵の名前の右端\r
             for (var i = 0; i < lines; i++)\r
                 _panelList[i].Width = panelWidth;\r
-            _infomationPanel.Location = new Point(AutoScrollPosition.X, AutoScrollPosition.Y);\r
+            _infomationPanel.Location = new Point(\r
+                (int)Round(0 * ShipLabel.ScaleFactor.Width) + AutoScrollPosition.X,\r
+                (int)Round(20 * ShipLabel.ScaleFactor.Height) +AutoScrollPosition.Y);\r
             _infomationPanel.Visible = true;\r
         }\r
 \r
@@ -275,20 +274,20 @@ namespace KancolleSniffer
         {\r
             _phaseLabel = new Label\r
             {\r
-                Location = new Point(72, 21),\r
+                Location = new Point(4, 4),\r
                 Size = new Size(31, 14)\r
             };\r
             _phaseLabel.Click += PhaseLabelClick;\r
             Controls.Add(_phaseLabel);\r
             _rankLabel = new Label\r
             {\r
-                Location = new Point(111, 22),\r
+                Location = new Point(37, 4),\r
                 Size = new Size(42, 12)\r
             };\r
             Controls.Add(_rankLabel);\r
-            for (var i = 0; i < 14; i++)\r
+            for (var i = 0; i < 13; i++)\r
             {\r
-                var y = LineHeight * i + 21;\r
+                var y = LineHeight * i + 38;\r
                 var panel = new Panel\r
                 {\r
                     Location = new Point(0, y),\r
@@ -329,25 +328,23 @@ namespace KancolleSniffer
 \r
             public InformationPanel()\r
             {\r
-                const int top = 4;\r
-                const int left = 1;\r
                 Visible = false;\r
-                Size = new Size(left + 206, top + 15);\r
+                Size = new Size(206, 16);\r
                 Controls.AddRange(_formation = new[]\r
                 {\r
                     new Label\r
                     {\r
-                        Location = new Point(46, 0),\r
+                        Location = new Point(46, 2),\r
                         Size = new Size(29, 12)\r
                     },\r
                     new Label\r
                     {\r
-                        Location = new Point(74, 0),\r
+                        Location = new Point(74, 2),\r
                         Size = new Size(29, 12)\r
                     },\r
                     new Label\r
                     {\r
-                        Location = new Point(0, 0),\r
+                        Location = new Point(0, 2),\r
                         Size = new Size(48, 12),\r
                         TextAlign = ContentAlignment.MiddleCenter\r
                     }\r
@@ -356,24 +353,22 @@ namespace KancolleSniffer
                 {\r
                     new Label\r
                     {\r
-                        Location = new Point(162, 0),\r
+                        Location = new Point(162, 2),\r
                         Size = new Size(23, 12),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new Label\r
                     {\r
-                        Location = new Point(183, 0),\r
+                        Location = new Point(183, 2),\r
                         Size = new Size(23, 12),\r
                         TextAlign = ContentAlignment.MiddleRight\r
                     },\r
                     new Label\r
                     {\r
-                        Location = new Point(110, 0),\r
+                        Location = new Point(110, 2),\r
                         Size = new Size(53, 12)\r
                     }\r
                 });\r
-                foreach (Control control in Controls)\r
-                    control.Location = new Point(control.Location.X + left, control.Location.Y + top);\r
                 // ReSharper disable once VirtualMemberCallInConstructor\r
                 BackColor = ShipLabels.ColumnColors[1];\r
             }\r