コミットメタ情報

リビジョン4ecdb3e22bc279ce9bf1dce2123cfa4776656c96 (tree)
日時2018-08-07 19:54:23
作者Kazuhiro Fujieda <fujieda@user...>
コミッターKazuhiro Fujieda

ログメッセージ

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

変更サマリ

差分

--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -17,7 +17,6 @@ using System.Collections.Generic;
1717 using System.Drawing;
1818 using System.Linq;
1919 using System.Windows.Forms;
20-using KancolleSniffer.Util;
2120 using KancolleSniffer.View;
2221 using static System.Math;
2322
@@ -126,7 +125,7 @@ namespace KancolleSniffer
126125 public void UpdateCellInfo()
127126 {
128127 battleResultPanel.Spoilers = _config.Spoilers;
129- battleResultPanel.UpdateCellInfo(_sniffer);
128+ battleResultPanel.UpdateCellInfo(_sniffer.CellInfo);
130129 }
131130
132131 private void SetHeaderSortOrder()
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -714,7 +714,6 @@ namespace KancolleSniffer
714714 ShowResultRank();
715715 if (_sniffer.Battle.BattleState == BattleState.Day)
716716 _listForm.UpdateAirBattleResult();
717- UpdateCellInfo();
718717 }
719718
720719 private void UpdateCellInfo()
--- a/KancolleSniffer/View/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -36,6 +36,7 @@ namespace KancolleSniffer.View
3636 private BattleState _prevBattleState;
3737 private readonly BattleResultRank[] _rank = new BattleResultRank[2];
3838 private readonly InformationPanel _infomationPanel;
39+ private CellInfo _cellInfo;
3940
4041 public Spoiler Spoilers { get; set; }
4142
@@ -66,6 +67,7 @@ namespace KancolleSniffer.View
6667 var state = sniffer.Battle.BattleState;
6768 var prev = _prevBattleState;
6869 _prevBattleState = state;
70+ _cellInfo = sniffer.CellInfo;
6971 if (prev == BattleState.None && state != BattleState.None)
7072 _result[0] = _result[1] = null;
7173 if (prev != BattleState.None && state == BattleState.None &&
@@ -73,6 +75,7 @@ namespace KancolleSniffer.View
7375 {
7476 ClearResult();
7577 SetPhase("結果");
78+ UpdateCellInfo(_cellInfo);
7679 return;
7780 }
7881 if (state != BattleState.Day && state != BattleState.Night)
@@ -257,6 +260,7 @@ namespace KancolleSniffer.View
257260 (int)Round(0 * ShipLabel.ScaleFactor.Width) + AutoScrollPosition.X,
258261 (int)Round(20 * ShipLabel.ScaleFactor.Height) + AutoScrollPosition.Y);
259262 _infomationPanel.Visible = true;
263+ UpdateCellInfo(_cellInfo);
260264 }
261265
262266 private string GetEqipString(ShipStatus ship)
@@ -285,12 +289,9 @@ namespace KancolleSniffer.View
285289 _rankLabel.Text = result[(int)rank];
286290 }
287291
288- public void UpdateCellInfo(Sniffer sniffer)
292+ public void UpdateCellInfo(CellInfo cellInfo)
289293 {
290- var text = sniffer.CellInfo;
291- if (text == null)
292- return;
293- _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? sniffer.CellInfo.Current : sniffer.CellInfo.Next;
294+ _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? cellInfo.Current : cellInfo.Next;
294295 _cellLabel.Location = new Point(ClientSize.Width - _cellLabel.Width - 2, 4);
295296 }
296297
旧リポジトリブラウザで表示