艦種の選択を隠すのをemptyHeaderでやるのをやめる

diff --git a/KancolleSniffer/Forms/ListForm.Designer.cs b/KancolleSniffer/Forms/ListForm.Designer.cs
index fd1c412..fd96850 100644 (file)
--- a/KancolleSniffer/Forms/ListForm.Designer.cs
+++ b/KancolleSniffer/Forms/ListForm.Designer.cs
@@ -70,7 +70,6 @@ namespace KancolleSniffer.Forms
             this.panelRepairHeader = new System.Windows.Forms.Panel();\r
             this.label10 = new System.Windows.Forms.Label();\r
             this.label1RepairHp = new System.Windows.Forms.Label();\r
-            this.panelEmptyHeader = new System.Windows.Forms.Panel();\r
             this.richTextBoxMiscText = new System.Windows.Forms.RichTextBox();\r
             this.contextMenuStripFleetData = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.fleetTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -318,13 +317,6 @@ namespace KancolleSniffer.Forms
             this.label1RepairHp.Text = "HP";\r
             this.label1RepairHp.Click += new System.EventHandler(this.labelHeaderHp_Click);\r
             // \r
-            // panelEmptyHeader\r
-            // \r
-            this.panelEmptyHeader.Location = new System.Drawing.Point(56, 3);\r
-            this.panelEmptyHeader.Name = "panelEmptyHeader";\r
-            this.panelEmptyHeader.Size = new System.Drawing.Size(167, 19);\r
-            this.panelEmptyHeader.TabIndex = 0;\r
-            // \r
             // richTextBoxMiscText\r
             // \r
             this.richTextBoxMiscText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
@@ -654,7 +646,6 @@ namespace KancolleSniffer.Forms
             this.Controls.Add(this.airBattleResultPanel);\r
             this.Controls.Add(this.battleResultPanel);\r
             this.Controls.Add(this.antiAirPanel);\r
-            this.Controls.Add(this.panelEmptyHeader);\r
             this.Controls.Add(this.panelRepairHeader);\r
             this.Controls.Add(this.panelGroupHeader);\r
             this.Controls.Add(this.labelSType);\r
@@ -711,7 +702,6 @@ namespace KancolleSniffer.Forms
         private System.Windows.Forms.Label label10;\r
         private System.Windows.Forms.Label label5;\r
         private System.Windows.Forms.Label label1RepairHp;\r
-        private System.Windows.Forms.Panel panelEmptyHeader;\r
         private FleetDataPanel fleetPanel;\r
         private ItemTreeView itemTreeView;\r
         private System.Windows.Forms.RichTextBox richTextBoxMiscText;\r

diff --git a/KancolleSniffer/Forms/ListForm.cs b/KancolleSniffer/Forms/ListForm.cs
index c0cdb73..33eedc0 100644 (file)
--- a/KancolleSniffer/Forms/ListForm.cs
+++ b/KancolleSniffer/Forms/ListForm.cs
@@ -166,10 +166,10 @@ namespace KancolleSniffer.Forms
             }\r
 \r
             Set(panelShipHeader, InShipStatus);\r
-            Set(panelEmptyHeader, InItemList || InAntiAir || InBattleResult || InMiscText);\r
             Set(panelGroupHeader, InGroupConfig);\r
             Set(panelRepairHeader, InRepairList);\r
             Set(panelFleetHeader, InFleetInfo);\r
+            SetSTypeDropDownVisible(InShipStatus || InRepairList);\r
         }\r
 \r
         private void SetPanelVisibility()\r
@@ -583,6 +583,14 @@ namespace KancolleSniffer.Forms
             battleResultPanel.ToggleHpPercent();\r
         }\r
 \r
+        private void SetSTypeDropDownVisible(bool visible)\r
+        {\r
+            if (!visible)\r
+                SetPanelSTypeState(false);\r
+            dropDownButtonSType.Visible = visible;\r
+            labelSType.Visible = visible;\r
+        }\r
+\r
         private void labelSTypeButton_Click(object sender, EventArgs e)\r
         {\r
             SetPanelSTypeState(!panelSType.Visible);\r