艦隊情報のヘッダに「基地」を追加する

diff --git a/KancolleSniffer/Forms/ListForm.Designer.cs b/KancolleSniffer/Forms/ListForm.Designer.cs
index fd96850..72b3359 100644 (file)
--- 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();\r
             this.deckBuilderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.panelFleetHeader = new System.Windows.Forms.Panel();\r
+            this.labelFleetBase = new System.Windows.Forms.Label();\r
             this.labelFleet4 = new System.Windows.Forms.Label();\r
             this.label1Fleet3 = new System.Windows.Forms.Label();\r
             this.labelFleet2 = new System.Windows.Forms.Label();\r
@@ -354,18 +355,29 @@ namespace KancolleSniffer.Forms
             // panelFleetHeader\r
             // \r
             this.panelFleetHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));\r
+            this.panelFleetHeader.Controls.Add(this.labelFleetBase);\r
             this.panelFleetHeader.Controls.Add(this.labelFleet4);\r
             this.panelFleetHeader.Controls.Add(this.label1Fleet3);\r
             this.panelFleetHeader.Controls.Add(this.labelFleet2);\r
             this.panelFleetHeader.Controls.Add(this.labelFleet1);\r
             this.panelFleetHeader.Location = new System.Drawing.Point(56, 3);\r
             this.panelFleetHeader.Name = "panelFleetHeader";\r
-            this.panelFleetHeader.Size = new System.Drawing.Size(167, 19);\r
+            this.panelFleetHeader.Size = new System.Drawing.Size(169, 19);\r
             this.panelFleetHeader.TabIndex = 0;\r
             // \r
+            // labelFleetBase\r
+            // \r
+            this.labelFleetBase.Location = new System.Drawing.Point(142, 1);\r
+            this.labelFleetBase.Name = "labelFleetBase";\r
+            this.labelFleetBase.Size = new System.Drawing.Size(29, 18);\r
+            this.labelFleetBase.TabIndex = 4;\r
+            this.labelFleetBase.Text = "基地";\r
+            this.labelFleetBase.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
+            this.labelFleetBase.Click += new System.EventHandler(this.labelFleet_Click);\r
+            // \r
             // labelFleet4\r
             // \r
-            this.labelFleet4.Location = new System.Drawing.Point(138, 1);\r
+            this.labelFleet4.Location = new System.Drawing.Point(111, 1);\r
             this.labelFleet4.Name = "labelFleet4";\r
             this.labelFleet4.Size = new System.Drawing.Size(29, 18);\r
             this.labelFleet4.TabIndex = 3;\r
@@ -375,7 +387,7 @@ namespace KancolleSniffer.Forms
             // \r
             // label1Fleet3\r
             // \r
-            this.label1Fleet3.Location = new System.Drawing.Point(100, 1);\r
+            this.label1Fleet3.Location = new System.Drawing.Point(80, 1);\r
             this.label1Fleet3.Name = "label1Fleet3";\r
             this.label1Fleet3.Size = new System.Drawing.Size(29, 18);\r
             this.label1Fleet3.TabIndex = 2;\r
@@ -385,7 +397,7 @@ namespace KancolleSniffer.Forms
             // \r
             // labelFleet2\r
             // \r
-            this.labelFleet2.Location = new System.Drawing.Point(62, 1);\r
+            this.labelFleet2.Location = new System.Drawing.Point(49, 1);\r
             this.labelFleet2.Name = "labelFleet2";\r
             this.labelFleet2.Size = new System.Drawing.Size(29, 18);\r
             this.labelFleet2.TabIndex = 1;\r
@@ -395,7 +407,7 @@ namespace KancolleSniffer.Forms
             // \r
             // labelFleet1\r
             // \r
-            this.labelFleet1.Location = new System.Drawing.Point(24, 1);\r
+            this.labelFleet1.Location = new System.Drawing.Point(19, 1);\r
             this.labelFleet1.Name = "labelFleet1";\r
             this.labelFleet1.Size = new System.Drawing.Size(29, 18);\r
             this.labelFleet1.TabIndex = 0;\r
@@ -536,7 +548,7 @@ namespace KancolleSniffer.Forms
             // labelSType\r
             // \r
             this.labelSType.AutoSize = true;\r
-            this.labelSType.Location = new System.Drawing.Point(74, 8);\r
+            this.labelSType.Location = new System.Drawing.Point(73, 8);\r
             this.labelSType.Name = "labelSType";\r
             this.labelSType.Size = new System.Drawing.Size(29, 12);\r
             this.labelSType.TabIndex = 20;\r
@@ -736,5 +748,6 @@ namespace KancolleSniffer.Forms
         private System.Windows.Forms.CheckBox checkBoxSTypeDetails;\r
         private System.Windows.Forms.ToolStripMenuItem kantaiBunsekiToolStripMenuItem;\r
         private System.Windows.Forms.Panel panelShipHeader;\r
+        private System.Windows.Forms.Label labelFleetBase;\r
     }\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/Forms/ListForm.cs b/KancolleSniffer/Forms/ListForm.cs
index 33eedc0..ffba887 100644 (file)
--- a/KancolleSniffer/Forms/ListForm.cs
+++ b/KancolleSniffer/Forms/ListForm.cs
@@ -568,7 +568,7 @@ namespace KancolleSniffer.Forms
 \r
         private void labelFleet_Click(object sender, EventArgs e)\r
         {\r
-            fleetPanel.ShowFleet(((Label)sender).Text);\r
+            fleetPanel.ShowFleet(((Control)sender).Text);\r
         }\r
 \r
         private void labelHeaderHp_Click(object sender, EventArgs e)\r

diff --git a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
index 9957a77..c508b74 100644 (file)
--- a/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
+++ b/KancolleSniffer/View/ListWindow/FleetDataPanel.cs
@@ -137,10 +137,10 @@ namespace KancolleSniffer.View.ListWindow
 \r
         public void ShowFleet(string fn)\r
         {\r
-            var i = Array.FindIndex(_data, e => e.Fleet.StartsWith(fn));\r
+            var i = Array.FindIndex(_data, e => e.Fleet.Contains(fn));\r
             if (i == -1)\r
                 return;\r
-            var y = Scaler.ScaleHeight(LineHeight * i);\r
+            var y = fn == "基地" ? int.MaxValue : Scaler.ScaleHeight(LineHeight * i);\r
             AutoScrollPosition = new Point(0, y);\r
         }\r
     }\r