戦況の何戦目がスクロールバーに隠れるのを直す

diff --git a/KancolleSniffer/ListForm.cs b/KancolleSniffer/ListForm.cs
index 8938b7c..ab6a245 100644 (file)
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -17,7 +17,6 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
-using KancolleSniffer.Util;\r
 using KancolleSniffer.View;\r
 using static System.Math;\r
 \r
@@ -126,7 +125,7 @@ namespace KancolleSniffer
         public void UpdateCellInfo()\r
         {\r
             battleResultPanel.Spoilers = _config.Spoilers;\r
-            battleResultPanel.UpdateCellInfo(_sniffer);\r
+            battleResultPanel.UpdateCellInfo(_sniffer.CellInfo);\r
         }\r
 \r
         private void SetHeaderSortOrder()\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index fdad103..c2806e2 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -714,7 +714,6 @@ namespace KancolleSniffer
                 ShowResultRank();\r
             if (_sniffer.Battle.BattleState == BattleState.Day)\r
                 _listForm.UpdateAirBattleResult();\r
-            UpdateCellInfo();\r
         }\r
 \r
         private void UpdateCellInfo()\r

diff --git a/KancolleSniffer/View/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
index c0b9b3b..1a258cd 100644 (file)
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -36,6 +36,7 @@ namespace KancolleSniffer.View
         private BattleState _prevBattleState;\r
         private readonly BattleResultRank[] _rank = new BattleResultRank[2];\r
         private readonly InformationPanel _infomationPanel;\r
+        private CellInfo _cellInfo;\r
 \r
         public Spoiler Spoilers { get; set; }\r
 \r
@@ -66,6 +67,7 @@ namespace KancolleSniffer.View
             var state = sniffer.Battle.BattleState;\r
             var prev = _prevBattleState;\r
             _prevBattleState = state;\r
+            _cellInfo = sniffer.CellInfo;\r
             if (prev == BattleState.None && state != BattleState.None)\r
                 _result[0] = _result[1] = null;\r
             if (prev != BattleState.None && state == BattleState.None &&\r
@@ -73,6 +75,7 @@ namespace KancolleSniffer.View
             {\r
                 ClearResult();\r
                 SetPhase("結果");\r
+                UpdateCellInfo(_cellInfo);\r
                 return;\r
             }\r
             if (state != BattleState.Day && state != BattleState.Night)\r
@@ -257,6 +260,7 @@ namespace KancolleSniffer.View
                 (int)Round(0 * ShipLabel.ScaleFactor.Width) + AutoScrollPosition.X,\r
                 (int)Round(20 * ShipLabel.ScaleFactor.Height) + AutoScrollPosition.Y);\r
             _infomationPanel.Visible = true;\r
+            UpdateCellInfo(_cellInfo);\r
         }\r
 \r
         private string GetEqipString(ShipStatus ship)\r
@@ -285,12 +289,9 @@ namespace KancolleSniffer.View
             _rankLabel.Text = result[(int)rank];\r
         }\r
 \r
-        public void UpdateCellInfo(Sniffer sniffer)\r
+        public void UpdateCellInfo(CellInfo cellInfo)\r
         {\r
-            var text = sniffer.CellInfo;\r
-            if (text == null)\r
-                return;\r
-            _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? sniffer.CellInfo.Current : sniffer.CellInfo.Next;\r
+            _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? cellInfo.Current : cellInfo.Next;\r
             _cellLabel.Location = new Point(ClientSize.Width - _cellLabel.Width - 2, 4);\r
         }\r
 \r