From a48e665d63c8221d2a54856d18a14797b8464de7 Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Sat, 15 Aug 2020 15:13:23 +0900 Subject: [PATCH] =?utf8?q?=E8=89=A6=E9=9A=8A=E6=83=85=E5=A0=B1=E3=81=AE?= =?utf8?q?=E3=83=98=E3=83=83=E3=83=80=E3=81=AB=E3=80=8C=E5=9F=BA=E5=9C=B0?= =?utf8?q?=E3=80=8D=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer/Forms/ListForm.Designer.cs | 25 +++++++++++++++++------ KancolleSniffer/Forms/ListForm.cs | 2 +- KancolleSniffer/View/ListWindow/FleetDataPanel.cs | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/KancolleSniffer/Forms/ListForm.Designer.cs b/KancolleSniffer/Forms/ListForm.Designer.cs index fd96850..72b3359 100644 --- a/KancolleSniffer/Forms/ListForm.Designer.cs +++ b/KancolleSniffer/Forms/ListForm.Designer.cs @@ -75,6 +75,7 @@ namespace KancolleSniffer.Forms this.fleetTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.deckBuilderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panelFleetHeader = new System.Windows.Forms.Panel(); + this.labelFleetBase = new System.Windows.Forms.Label(); this.labelFleet4 = new System.Windows.Forms.Label(); this.label1Fleet3 = new System.Windows.Forms.Label(); this.labelFleet2 = new System.Windows.Forms.Label(); @@ -354,18 +355,29 @@ namespace KancolleSniffer.Forms // panelFleetHeader // this.panelFleetHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panelFleetHeader.Controls.Add(this.labelFleetBase); this.panelFleetHeader.Controls.Add(this.labelFleet4); this.panelFleetHeader.Controls.Add(this.label1Fleet3); this.panelFleetHeader.Controls.Add(this.labelFleet2); this.panelFleetHeader.Controls.Add(this.labelFleet1); this.panelFleetHeader.Location = new System.Drawing.Point(56, 3); this.panelFleetHeader.Name = "panelFleetHeader"; - this.panelFleetHeader.Size = new System.Drawing.Size(167, 19); + this.panelFleetHeader.Size = new System.Drawing.Size(169, 19); this.panelFleetHeader.TabIndex = 0; // + // labelFleetBase + // + this.labelFleetBase.Location = new System.Drawing.Point(142, 1); + this.labelFleetBase.Name = "labelFleetBase"; + this.labelFleetBase.Size = new System.Drawing.Size(29, 18); + this.labelFleetBase.TabIndex = 4; + this.labelFleetBase.Text = "基地"; + this.labelFleetBase.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.labelFleetBase.Click += new System.EventHandler(this.labelFleet_Click); + // // labelFleet4 // - this.labelFleet4.Location = new System.Drawing.Point(138, 1); + this.labelFleet4.Location = new System.Drawing.Point(111, 1); this.labelFleet4.Name = "labelFleet4"; this.labelFleet4.Size = new System.Drawing.Size(29, 18); this.labelFleet4.TabIndex = 3; @@ -375,7 +387,7 @@ namespace KancolleSniffer.Forms // // label1Fleet3 // - this.label1Fleet3.Location = new System.Drawing.Point(100, 1); + this.label1Fleet3.Location = new System.Drawing.Point(80, 1); this.label1Fleet3.Name = "label1Fleet3"; this.label1Fleet3.Size = new System.Drawing.Size(29, 18); this.label1Fleet3.TabIndex = 2; @@ -385,7 +397,7 @@ namespace KancolleSniffer.Forms // // labelFleet2 // - this.labelFleet2.Location = new System.Drawing.Point(62, 1); + this.labelFleet2.Location = new System.Drawing.Point(49, 1); this.labelFleet2.Name = "labelFleet2"; this.labelFleet2.Size = new System.Drawing.Size(29, 18); this.labelFleet2.TabIndex = 1; @@ -395,7 +407,7 @@ namespace KancolleSniffer.Forms // // labelFleet1 // - this.labelFleet1.Location = new System.Drawing.Point(24, 1); + this.labelFleet1.Location = new System.Drawing.Point(19, 1); this.labelFleet1.Name = "labelFleet1"; this.labelFleet1.Size = new System.Drawing.Size(29, 18); this.labelFleet1.TabIndex = 0; @@ -536,7 +548,7 @@ namespace KancolleSniffer.Forms // labelSType // this.labelSType.AutoSize = true; - this.labelSType.Location = new System.Drawing.Point(74, 8); + this.labelSType.Location = new System.Drawing.Point(73, 8); this.labelSType.Name = "labelSType"; this.labelSType.Size = new System.Drawing.Size(29, 12); this.labelSType.TabIndex = 20; @@ -736,5 +748,6 @@ namespace KancolleSniffer.Forms private System.Windows.Forms.CheckBox checkBoxSTypeDetails; private System.Windows.Forms.ToolStripMenuItem kantaiBunsekiToolStripMenuItem; private System.Windows.Forms.Panel panelShipHeader; + private System.Windows.Forms.Label labelFleetBase; } } \ No newline at end of file diff --git a/KancolleSniffer/Forms/ListForm.cs b/KancolleSniffer/Forms/ListForm.cs index 33eedc0..ffba887 100644 --- a/KancolleSniffer/Forms/ListForm.cs +++ b/KancolleSniffer/Forms/ListForm.cs @@ -568,7 +568,7 @@ namespace KancolleSniffer.Forms private void labelFleet_Click(object sender, EventArgs e) { - fleetPanel.ShowFleet(((Label)sender).Text); + fleetPanel.ShowFleet(((Control)sender).Text); } private void labelHeaderHp_Click(object sender, EventArgs e) diff --git a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs index 9957a77..c508b74 100644 --- a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs +++ b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs @@ -137,10 +137,10 @@ namespace KancolleSniffer.View.ListWindow public void ShowFleet(string fn) { - var i = Array.FindIndex(_data, e => e.Fleet.StartsWith(fn)); + var i = Array.FindIndex(_data, e => e.Fleet.Contains(fn)); if (i == -1) return; - var y = Scaler.ScaleHeight(LineHeight * i); + var y = fn == "基地" ? int.MaxValue : Scaler.ScaleHeight(LineHeight * i); AutoScrollPosition = new Point(0, y); } } -- 2.11.0