From 1e39ccac5ece446a58e457fce1692fa9f3b4809f Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Mon, 29 Apr 2019 20:19:18 +0900 Subject: [PATCH] =?utf8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=81=AE=E8=A6=81?= =?utf8?q?=E4=BF=AE=E5=BE=A9=E4=B8=80=E8=A6=A7=E3=81=AE=E9=AB=98=E3=81=95?= =?utf8?q?=E3=82=92=E5=8F=AF=E5=A4=89=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/View/RepairListForMain.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/KancolleSniffer/View/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs index 1436eb0..8427671 100644 --- a/KancolleSniffer/View/RepairListForMain.cs +++ b/KancolleSniffer/View/RepairListForMain.cs @@ -27,7 +27,7 @@ namespace KancolleSniffer.View private const int PanelPadding = 5; private const int LabelPadding = 2; private const int LineHeight = 16; - private readonly RepairListLabels[] _repairLabels = new RepairListLabels[14]; + private RepairListLabels[] _repairLabels; private ShipStatus[] _repairList = new ShipStatus[0]; private ListScroller _listScroller; @@ -44,6 +44,7 @@ namespace KancolleSniffer.View public void CreateLabels(EventHandler onClick) { + _repairLabels = new RepairListLabels[Lines]; SuspendLayout(); for (var i = 0; i < _repairLabels.Length; i++) { @@ -58,7 +59,7 @@ namespace KancolleSniffer.View BackGround = new ShipLabel { Location = new Point(0, y - LabelPadding), - Size = new Size(Width, height + LabelPadding + 1) + Size = new Size(Width, height + LabelPadding) } }; Controls.AddRange(_repairLabels[i].Labels); @@ -73,6 +74,15 @@ namespace KancolleSniffer.View SetupListScroller(); } + private int Lines + { + get + { + var baseHeight = (Parent.ClientRectangle.Height - Location.Y) / ShipLabel.ScaleFactor.Height; + return (int)Round((baseHeight - PanelPadding * 2) / LineHeight); + } + } + private void SetupListScroller() { _listScroller = new ListScroller(this, _repairLabels[0].Labels, _repairLabels.Last().Labels) -- 2.11.0