パネルのクリックでもパネルを閉じるようにする

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 3999ada..9e244af 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -132,6 +132,7 @@ namespace KancolleSniffer
             this.contextMenuStripMain = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.listToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.LogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.CaptureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ExitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.labelFleet1 = new System.Windows.Forms.Label();\r
@@ -161,7 +162,6 @@ namespace KancolleSniffer
             this.labelFuelSq4 = new System.Windows.Forms.Label();\r
             this.toolTipAchievement = new System.Windows.Forms.ToolTip(this.components);\r
             this.toolTipFigherPower = new System.Windows.Forms.ToolTip(this.components);\r
-            this.CaptureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.panelHeadquarters.SuspendLayout();\r
             this.panelShipInfo.SuspendLayout();\r
             this.panelBattleInfo.SuspendLayout();\r
@@ -419,6 +419,7 @@ namespace KancolleSniffer
             this.panelMaterialHistory.Size = new System.Drawing.Size(188, 52);\r
             this.panelMaterialHistory.TabIndex = 41;\r
             this.panelMaterialHistory.Visible = false;\r
+            this.panelMaterialHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // labelBouxiteHistory\r
             // \r
@@ -428,6 +429,7 @@ namespace KancolleSniffer
             this.labelBouxiteHistory.TabIndex = 7;\r
             this.labelBouxiteHistory.Text = "ボーキ";\r
             this.labelBouxiteHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
+            this.labelBouxiteHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // labelSteelHistory\r
             // \r
@@ -437,6 +439,7 @@ namespace KancolleSniffer
             this.labelSteelHistory.TabIndex = 6;\r
             this.labelSteelHistory.Text = "鋼材";\r
             this.labelSteelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
+            this.labelSteelHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // labelBulletHistory\r
             // \r
@@ -446,6 +449,7 @@ namespace KancolleSniffer
             this.labelBulletHistory.TabIndex = 5;\r
             this.labelBulletHistory.Text = "弾薬";\r
             this.labelBulletHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
+            this.labelBulletHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // label35\r
             // \r
@@ -455,6 +459,7 @@ namespace KancolleSniffer
             this.label35.Size = new System.Drawing.Size(29, 36);\r
             this.label35.TabIndex = 4;\r
             this.label35.Text = "母港\r\n今日\r\n今週";\r
+            this.label35.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // labelFuelHistory\r
             // \r
@@ -464,6 +469,7 @@ namespace KancolleSniffer
             this.labelFuelHistory.TabIndex = 0;\r
             this.labelFuelHistory.Text = "燃料";\r
             this.labelFuelHistory.TextAlign = System.Drawing.ContentAlignment.TopRight;\r
+            this.labelFuelHistory.Click += new System.EventHandler(this.panelMaterialHistory_Click);\r
             // \r
             // labelRepair\r
             // \r
@@ -934,33 +940,40 @@ namespace KancolleSniffer
             this.ConfigToolStripMenuItem,\r
             this.ExitToolStripMenuItem});\r
             this.contextMenuStripMain.Name = "contextMenuStripToolTip";\r
-            this.contextMenuStripMain.Size = new System.Drawing.Size(153, 136);\r
+            this.contextMenuStripMain.Size = new System.Drawing.Size(131, 114);\r
             // \r
             // listToolStripMenuItem\r
             // \r
             this.listToolStripMenuItem.Name = "listToolStripMenuItem";\r
-            this.listToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
+            this.listToolStripMenuItem.Size = new System.Drawing.Size(130, 22);\r
             this.listToolStripMenuItem.Text = "一覧(&L)";\r
             this.listToolStripMenuItem.Click += new System.EventHandler(this.ShipListToolStripMenuItem_Click);\r
             // \r
             // LogToolStripMenuItem\r
             // \r
             this.LogToolStripMenuItem.Name = "LogToolStripMenuItem";\r
-            this.LogToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
+            this.LogToolStripMenuItem.Size = new System.Drawing.Size(130, 22);\r
             this.LogToolStripMenuItem.Text = "報告書(&R)";\r
             this.LogToolStripMenuItem.Click += new System.EventHandler(this.LogToolStripMenuItem_Click);\r
             // \r
+            // CaptureToolStripMenuItem\r
+            // \r
+            this.CaptureToolStripMenuItem.Name = "CaptureToolStripMenuItem";\r
+            this.CaptureToolStripMenuItem.Size = new System.Drawing.Size(130, 22);\r
+            this.CaptureToolStripMenuItem.Text = "撮影(&C)";\r
+            this.CaptureToolStripMenuItem.Click += new System.EventHandler(this.CaptureToolStripMenuItem_Click);\r
+            // \r
             // ConfigToolStripMenuItem\r
             // \r
             this.ConfigToolStripMenuItem.Name = "ConfigToolStripMenuItem";\r
-            this.ConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
+            this.ConfigToolStripMenuItem.Size = new System.Drawing.Size(130, 22);\r
             this.ConfigToolStripMenuItem.Text = "設定(&O)";\r
             this.ConfigToolStripMenuItem.Click += new System.EventHandler(this.ConfigToolStripMenuItem_Click);\r
             // \r
             // ExitToolStripMenuItem\r
             // \r
             this.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem";\r
-            this.ExitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
+            this.ExitToolStripMenuItem.Size = new System.Drawing.Size(130, 22);\r
             this.ExitToolStripMenuItem.Text = "終了(&X)";\r
             this.ExitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolStripMenuItem_Click);\r
             // \r
@@ -1051,6 +1064,7 @@ namespace KancolleSniffer
             this.labelBucketHistory.Text = "+100 今日\r\n+100 今週";\r
             this.labelBucketHistory.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.labelBucketHistory.Visible = false;\r
+            this.labelBucketHistory.Click += new System.EventHandler(this.labelBucketHistory_Click);\r
             // \r
             // label36\r
             // \r
@@ -1079,6 +1093,7 @@ namespace KancolleSniffer
             this.panelDamagedShipList.Size = new System.Drawing.Size(129, 19);\r
             this.panelDamagedShipList.TabIndex = 44;\r
             this.panelDamagedShipList.Visible = false;\r
+            this.panelDamagedShipList.Click += new System.EventHandler(this.panelDamagedShipList_Click);\r
             // \r
             // labelDamgedShipListButton\r
             // \r
@@ -1205,13 +1220,6 @@ namespace KancolleSniffer
             // \r
             this.toolTipAchievement.ShowAlways = true;\r
             // \r
-            // CaptureToolStripMenuItem\r
-            // \r
-            this.CaptureToolStripMenuItem.Name = "CaptureToolStripMenuItem";\r
-            this.CaptureToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
-            this.CaptureToolStripMenuItem.Text = "撮影(&C)";\r
-            this.CaptureToolStripMenuItem.Click += new System.EventHandler(this.CaptureToolStripMenuItem_Click);\r
-            // \r
             // MainForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index c82fc56..0dd201c 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -70,7 +70,7 @@ namespace KancolleSniffer
             _shipLabels = new ShipLabels();\r
             _shipLabels.CreateAkashiTimers(panelShipInfo);\r
             _shipLabels.CreateLabels(panelShipInfo, ShowShipOnShipList);\r
-            _shipLabels.CreateDamagedShipList(panelDamagedShipList);\r
+            _shipLabels.CreateDamagedShipList(panelDamagedShipList, panelDamagedShipList_Click);\r
             _shipLabels.CreateNDockLabels(panelDock);\r
             _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};\r
             _noticeQueue = new NoticeQueue(Ring);\r
@@ -841,6 +841,12 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
+        private void labelBucketHistory_Click(object sender, EventArgs e)\r
+        {\r
+            labelBucketHistory.Visible = false;\r
+            labelBucketHistoryButton.BackColor = DefaultBackColor;\r
+        }\r
+\r
         private void labelMaterialHistoryButton_Click(object sender, EventArgs e)\r
         {\r
             if (panelMaterialHistory.Visible)\r
@@ -856,6 +862,12 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
+        private void panelMaterialHistory_Click(object sender, EventArgs e)\r
+        {\r
+            panelMaterialHistory.Visible = false;\r
+            labelMaterialHistoryButton.BackColor = DefaultBackColor;\r
+        }\r
+\r
         public void ResetAchievemnt()\r
         {\r
             _sniffer.Achievement.Reset();\r
@@ -877,6 +889,12 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
+        private void panelDamagedShipList_Click(object sender, EventArgs e)\r
+        {\r
+            panelDamagedShipList.Visible = false;\r
+            labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+        }\r
+\r
         private void ShipListToolStripMenuItem_Click(object sender, EventArgs e)\r
         {\r
             _shipListForm.UpdateList();\r

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index 0886fc2..200f0fa 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -157,7 +157,7 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        public void CreateDamagedShipList(Control parent)\r
+        public void CreateDamagedShipList(Control parent, EventHandler onClick)\r
         {\r
             parent.SuspendLayout();\r
             for (var i = 0; i < _damagedShipList.Length; i++)\r
@@ -176,6 +176,7 @@ namespace KancolleSniffer
                 {\r
                     label.Scale();\r
                     label.PresetColor = label.BackColor = ColumnColors[(i + 1) % 2];\r
+                    label.Click += onClick;\r
                 }\r
             }\r
             _panelDamagedShipList = parent;\r