From 3d3298e9f25a8631db6714739746c1459a458973 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 13 Apr 2022 01:35:09 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=81=AE=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E3=82=92PublicSearchHeaderPanel=E3=81=AB=E5=88=86=E9=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/PublicSearchHeaderPanelTest.cs   |  34 +++
 OpenTween.Tests/TweenMainTest.cs              |  19 +-
 .../PublicSearchHeaderPanel.Designer.cs       | 122 +++++++++
 OpenTween/Controls/PublicSearchHeaderPanel.cs | 152 +++++++++++
 .../Controls/PublicSearchHeaderPanel.resx     |  88 +++++++
 OpenTween/OpenTween.csproj                    |   9 +
 OpenTween/Tween.cs                            | 244 +++++-------------
 7 files changed, 472 insertions(+), 196 deletions(-)
 create mode 100644 OpenTween.Tests/Controls/PublicSearchHeaderPanelTest.cs
 create mode 100644 OpenTween/Controls/PublicSearchHeaderPanel.Designer.cs
 create mode 100644 OpenTween/Controls/PublicSearchHeaderPanel.cs
 create mode 100644 OpenTween/Controls/PublicSearchHeaderPanel.resx

diff --git a/OpenTween.Tests/Controls/PublicSearchHeaderPanelTest.cs b/OpenTween.Tests/Controls/PublicSearchHeaderPanelTest.cs
new file mode 100644
index 000000000..4719e7817
--- /dev/null
+++ b/OpenTween.Tests/Controls/PublicSearchHeaderPanelTest.cs
@@ -0,0 +1,34 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General public License
+// for more details.
+//
+// You should have received a copy of the GNU General public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using Xunit;
+
+namespace OpenTween.Controls
+{
+    public class PublicSearchHeaderPanelTest
+    {
+        [WinFormsFact]
+        public void Initialize_Test()
+        {
+            using var panel = new PublicSearchHeaderPanel();
+        }
+    }
+}
diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index 526fbf025..a2f50e6b5 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -28,6 +28,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using OpenTween.Api.DataModel;
+using OpenTween.Controls;
 using OpenTween.Models;
 using OpenTween.OpenTweenCustomControl;
 using OpenTween.Setting;
@@ -166,17 +167,9 @@ public void AddNewTab_PublicSearchTabTest()
                 Assert.Equal(2, tabPage.Controls.Count);
                 Assert.IsType<DetailsListView>(tabPage.Controls[0]);
 
-                var panel = Assert.IsType<Panel>(tabPage.Controls[1]);
-                Assert.Equal(4, panel.Controls.Count);
-
-                var comboSearchWord = Assert.IsType<ComboBox>(panel.Controls[0]);
-                Assert.Equal("#OpenTween", comboSearchWord.Text);
-
-                var comboSearchLang = Assert.IsType<ComboBox>(panel.Controls[1]);
-                Assert.Equal("ja", comboSearchLang.Text);
-
-                Assert.IsType<Button>(panel.Controls[2]);
-                Assert.IsType<Label>(panel.Controls[3]);
+                var header = Assert.IsType<PublicSearchHeaderPanel>(tabPage.Controls[1]);
+                Assert.Equal("#OpenTween", header.Query);
+                Assert.Equal("ja", header.Lang);
             });
         }
 
@@ -198,7 +191,7 @@ public void RemoveSpecifiedTab_Test()
 
                 var tabPage = tweenMain.ListTab.TabPages[4];
                 var listView = (DetailsListView)tabPage.Controls[0];
-                var searchPanel = (Panel)tabPage.Controls[1];
+                var header = (PublicSearchHeaderPanel)tabPage.Controls[1];
                 Assert.Equal("hoge", tabPage.Text);
 
                 tweenMain.RemoveSpecifiedTab("hoge", confirm: false);
@@ -207,7 +200,7 @@ public void RemoveSpecifiedTab_Test()
                 Assert.False(context.TabInfo.ContainsTab("hoge"));
                 Assert.True(tabPage.IsDisposed);
                 Assert.True(listView.IsDisposed);
-                Assert.True(searchPanel.IsDisposed);
+                Assert.True(header.IsDisposed);
             });
         }
 
diff --git a/OpenTween/Controls/PublicSearchHeaderPanel.Designer.cs b/OpenTween/Controls/PublicSearchHeaderPanel.Designer.cs
new file mode 100644
index 000000000..8b7663fbb
--- /dev/null
+++ b/OpenTween/Controls/PublicSearchHeaderPanel.Designer.cs
@@ -0,0 +1,122 @@
+namespace OpenTween.Controls
+{
+    partial class PublicSearchHeaderPanel
+    {
+        /// <summary> 
+        /// 必要なデザイナー変数です。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 使用中のリソースをすべてクリーンアップします。
+        /// </summary>
+        /// <param name="disposing">マネージド リソースを破棄する場合は true を指定し、その他の場合は false を指定します。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region コンポーネント デザイナーで生成されたコード
+
+        /// <summary> 
+        /// デザイナー サポートに必要なメソッドです。このメソッドの内容を 
+        /// コード エディターで変更しないでください。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PublicSearchHeaderPanel));
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBoxQuery = new System.Windows.Forms.ComboBox();
+            this.comboBoxLang = new System.Windows.Forms.ComboBox();
+            this.buttonSearch = new System.Windows.Forms.Button();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tableLayoutPanel1
+            // 
+            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.comboBoxQuery, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.comboBoxLang, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.buttonSearch, 3, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.Enter += new System.EventHandler(this.TableLayoutPanel1_Enter);
+            this.tableLayoutPanel1.Leave += new System.EventHandler(this.TableLayoutPanel1_Leave);
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // comboBoxQuery
+            // 
+            resources.ApplyResources(this.comboBoxQuery, "comboBoxQuery");
+            this.comboBoxQuery.FormattingEnabled = true;
+            this.comboBoxQuery.Name = "comboBoxQuery";
+            this.comboBoxQuery.TabStop = false;
+            this.comboBoxQuery.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ComboBoxQuery_KeyDown);
+            // 
+            // comboBoxLang
+            // 
+            resources.ApplyResources(this.comboBoxLang, "comboBoxLang");
+            this.comboBoxLang.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxLang.FormattingEnabled = true;
+            this.comboBoxLang.Items.AddRange(new object[] {
+            resources.GetString("comboBoxLang.Items"),
+            resources.GetString("comboBoxLang.Items1"),
+            resources.GetString("comboBoxLang.Items2"),
+            resources.GetString("comboBoxLang.Items3"),
+            resources.GetString("comboBoxLang.Items4"),
+            resources.GetString("comboBoxLang.Items5"),
+            resources.GetString("comboBoxLang.Items6"),
+            resources.GetString("comboBoxLang.Items7"),
+            resources.GetString("comboBoxLang.Items8"),
+            resources.GetString("comboBoxLang.Items9"),
+            resources.GetString("comboBoxLang.Items10"),
+            resources.GetString("comboBoxLang.Items11"),
+            resources.GetString("comboBoxLang.Items12"),
+            resources.GetString("comboBoxLang.Items13"),
+            resources.GetString("comboBoxLang.Items14"),
+            resources.GetString("comboBoxLang.Items15"),
+            resources.GetString("comboBoxLang.Items16"),
+            resources.GetString("comboBoxLang.Items17"),
+            resources.GetString("comboBoxLang.Items18"),
+            resources.GetString("comboBoxLang.Items19")});
+            this.comboBoxLang.Name = "comboBoxLang";
+            this.comboBoxLang.TabStop = false;
+            this.comboBoxLang.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ComboBoxLang_KeyDown);
+            // 
+            // buttonSearch
+            // 
+            resources.ApplyResources(this.buttonSearch, "buttonSearch");
+            this.buttonSearch.Name = "buttonSearch";
+            this.buttonSearch.TabStop = false;
+            this.buttonSearch.UseVisualStyleBackColor = true;
+            this.buttonSearch.Click += new System.EventHandler(this.ButtonSearch_Click);
+            // 
+            // PublicSearchHeaderPanel
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Name = "PublicSearchHeaderPanel";
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox comboBoxQuery;
+        private System.Windows.Forms.ComboBox comboBoxLang;
+        private System.Windows.Forms.Button buttonSearch;
+    }
+}
diff --git a/OpenTween/Controls/PublicSearchHeaderPanel.cs b/OpenTween/Controls/PublicSearchHeaderPanel.cs
new file mode 100644
index 000000000..dc99cf87f
--- /dev/null
+++ b/OpenTween/Controls/PublicSearchHeaderPanel.cs
@@ -0,0 +1,152 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <kiri.feather@gmail.com>
+//           (c) 2008-2011 Moz (@syo68k)
+//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
+//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
+//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
+//           (c) 2011      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General public License
+// for more details.
+//
+// You should have received a copy of the GNU General public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+#nullable enable
+
+using System;
+using System.Windows.Forms;
+
+namespace OpenTween.Controls
+{
+    public partial class PublicSearchHeaderPanel : UserControl
+    {
+        public string Query
+        {
+            get => this.comboBoxQuery.Text;
+            set => this.InsertQueryHistory(value);
+        }
+
+        public string Lang
+        {
+            get => this.comboBoxLang.Text;
+            set => this.comboBoxLang.Text = value;
+        }
+
+        public event EventHandler<EventArgs>? EscKeyDown;
+
+        public event EventHandler<EventArgs>? Search;
+
+        private bool layoutFixed = false;
+
+        public PublicSearchHeaderPanel()
+            => this.InitializeComponent();
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            base.OnVisibleChanged(e);
+            this.FixLayoutWorkaround();
+        }
+
+        public void FixLayoutWorkaround()
+        {
+            if (this.layoutFixed)
+                return;
+
+            // ComboBox が正しく上下中央揃えにならない現象の回避策
+            using (ControlTransaction.Layout(this.tableLayoutPanel1))
+            {
+                var height = this.comboBoxQuery.Height;
+                this.buttonSearch.Height = height;
+                this.comboBoxQuery.Height += 1;
+                this.comboBoxQuery.Height = height;
+                this.comboBoxLang.Height += 1;
+                this.comboBoxLang.Height = height;
+            }
+
+            this.layoutFixed = true;
+        }
+
+        public void FocusToQuery()
+            => this.comboBoxQuery.Focus();
+
+        private void DoSearch()
+        {
+            this.Search?.Invoke(this, EventArgs.Empty);
+
+            var query = this.Query.Trim();
+            this.InsertQueryHistory(query);
+        }
+
+        private void InsertQueryHistory(string query)
+        {
+            if (MyCommon.IsNullOrEmpty(query))
+                return;
+
+            var index = this.comboBoxQuery.Items.IndexOf(query);
+            if (index != -1)
+                this.comboBoxQuery.Items.RemoveAt(index);
+            this.comboBoxQuery.Items.Insert(0, query);
+            this.comboBoxQuery.Text = query;
+            this.comboBoxQuery.SelectAll();
+        }
+
+        private void EnableTabStop()
+        {
+            this.comboBoxQuery.TabStop = true;
+            this.comboBoxLang.TabStop = true;
+            this.buttonSearch.TabStop = true;
+        }
+
+        private void DisableTabStop()
+        {
+            this.comboBoxQuery.TabStop = false;
+            this.comboBoxLang.TabStop = false;
+            this.buttonSearch.TabStop = false;
+        }
+
+        private void TableLayoutPanel1_Enter(object sender, EventArgs e)
+            => this.EnableTabStop();
+
+        private void TableLayoutPanel1_Leave(object sender, EventArgs e)
+            => this.DisableTabStop();
+
+        private void ComboBoxQuery_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+            {
+                e.SuppressKeyPress = true;
+                this.EscKeyDown?.Invoke(this, EventArgs.Empty);
+            }
+            else if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+                this.DoSearch();
+            }
+        }
+
+        private void ComboBoxLang_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+                this.DoSearch();
+            }
+        }
+
+        private void ButtonSearch_Click(object sender, EventArgs e)
+            => this.DoSearch();
+    }
+}
diff --git a/OpenTween/Controls/PublicSearchHeaderPanel.resx b/OpenTween/Controls/PublicSearchHeaderPanel.resx
new file mode 100644
index 000000000..e06e90635
--- /dev/null
+++ b/OpenTween/Controls/PublicSearchHeaderPanel.resx
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?><root xml:space="preserve">
+	<resheader name="resmimetype"><value>text/microsoft-resx</value></resheader>
+	<resheader name="version"><value>2.0</value></resheader>
+	<resheader name="reader"><value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader>
+	<resheader name="writer"><value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader>
+	<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+	<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+	<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+
+	<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"><value>96, 96</value></data>
+	<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"><value>True</value></metadata>
+	<data name="$this.Size" type="System.Drawing.Size, System.Drawing"><value>400, 22</value></data>
+	<data name="&gt;&gt;$this.Name"><value>PublicSearchHeaderPanel</value></data>
+	<data name="&gt;&gt;$this.Type"><value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;buttonSearch.Name"><value>buttonSearch</value></data>
+	<data name="&gt;&gt;buttonSearch.Parent"><value>tableLayoutPanel1</value></data>
+	<data name="&gt;&gt;buttonSearch.Type"><value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;buttonSearch.ZOrder"><value>3</value></data>
+	<data name="&gt;&gt;comboBoxLang.Name"><value>comboBoxLang</value></data>
+	<data name="&gt;&gt;comboBoxLang.Parent"><value>tableLayoutPanel1</value></data>
+	<data name="&gt;&gt;comboBoxLang.Type"><value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;comboBoxLang.ZOrder"><value>2</value></data>
+	<data name="&gt;&gt;comboBoxQuery.Name"><value>comboBoxQuery</value></data>
+	<data name="&gt;&gt;comboBoxQuery.Parent"><value>tableLayoutPanel1</value></data>
+	<data name="&gt;&gt;comboBoxQuery.Type"><value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;comboBoxQuery.ZOrder"><value>1</value></data>
+	<data name="&gt;&gt;label1.Name"><value>label1</value></data>
+	<data name="&gt;&gt;label1.Parent"><value>tableLayoutPanel1</value></data>
+	<data name="&gt;&gt;label1.Type"><value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;label1.ZOrder"><value>0</value></data>
+	<data name="&gt;&gt;tableLayoutPanel1.Name"><value>tableLayoutPanel1</value></data>
+	<data name="&gt;&gt;tableLayoutPanel1.Parent"><value>$this</value></data>
+	<data name="&gt;&gt;tableLayoutPanel1.Type"><value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;tableLayoutPanel1.ZOrder"><value>0</value></data>
+	<data name="buttonSearch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"><value>Left</value></data>
+	<data name="buttonSearch.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
+	<data name="buttonSearch.Location" type="System.Drawing.Point, System.Drawing"><value>326, 0</value></data>
+	<data name="buttonSearch.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 0, 0</value></data>
+	<data name="buttonSearch.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>12, 0, 12, 0</value></data>
+	<data name="buttonSearch.Size" type="System.Drawing.Size, System.Drawing"><value>74, 22</value></data>
+	<data name="buttonSearch.TabIndex" type="System.Int32, mscorlib"><value>3</value></data>
+	<data name="buttonSearch.Text"><value>Search</value></data>
+	<data name="comboBoxLang.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"><value>Left</value></data>
+	<data name="comboBoxLang.Items"><value /></data>
+	<data name="comboBoxLang.Items1"><value>ja</value></data>
+	<data name="comboBoxLang.Items10"><value>hu</value></data>
+	<data name="comboBoxLang.Items11"><value>is</value></data>
+	<data name="comboBoxLang.Items12"><value>it</value></data>
+	<data name="comboBoxLang.Items13"><value>no</value></data>
+	<data name="comboBoxLang.Items14"><value>pl</value></data>
+	<data name="comboBoxLang.Items15"><value>pt</value></data>
+	<data name="comboBoxLang.Items16"><value>ru</value></data>
+	<data name="comboBoxLang.Items17"><value>es</value></data>
+	<data name="comboBoxLang.Items18"><value>sv</value></data>
+	<data name="comboBoxLang.Items19"><value>th</value></data>
+	<data name="comboBoxLang.Items2"><value>en</value></data>
+	<data name="comboBoxLang.Items3"><value>ar</value></data>
+	<data name="comboBoxLang.Items4"><value>da</value></data>
+	<data name="comboBoxLang.Items5"><value>nl</value></data>
+	<data name="comboBoxLang.Items6"><value>fa</value></data>
+	<data name="comboBoxLang.Items7"><value>fi</value></data>
+	<data name="comboBoxLang.Items8"><value>fr</value></data>
+	<data name="comboBoxLang.Items9"><value>de</value></data>
+	<data name="comboBoxLang.Location" type="System.Drawing.Point, System.Drawing"><value>276, 1</value></data>
+	<data name="comboBoxLang.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 0, 0</value></data>
+	<data name="comboBoxLang.Size" type="System.Drawing.Size, System.Drawing"><value>50, 20</value></data>
+	<data name="comboBoxLang.TabIndex" type="System.Int32, mscorlib"><value>2</value></data>
+	<data name="comboBoxQuery.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"><value>Left, Right</value></data>
+	<data name="comboBoxQuery.Location" type="System.Drawing.Point, System.Drawing"><value>89, 1</value></data>
+	<data name="comboBoxQuery.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 0, 0</value></data>
+	<data name="comboBoxQuery.Size" type="System.Drawing.Size, System.Drawing"><value>187, 20</value></data>
+	<data name="comboBoxQuery.TabIndex" type="System.Int32, mscorlib"><value>1</value></data>
+	<data name="label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"><value>Left</value></data>
+	<data name="label1.AutoSize" type="System.Boolean, mscorlib"><value>True</value></data>
+	<data name="label1.Location" type="System.Drawing.Point, System.Drawing"><value>0, 5</value></data>
+	<data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 10, 0</value></data>
+	<data name="label1.Size" type="System.Drawing.Size, System.Drawing"><value>79, 12</value></data>
+	<data name="label1.TabIndex" type="System.Int32, mscorlib"><value>0</value></data>
+	<data name="label1.Text"><value>Search(C-S-f)</value></data>
+	<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib"><value>4</value></data>
+	<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"><value>Fill</value></data>
+	<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"><value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="comboBoxQuery" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="comboBoxLang" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="buttonSearch" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value></data>
+	<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing"><value>0, 0</value></data>
+	<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"><value>0, 0, 0, 0</value></data>
+	<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib"><value>1</value></data>
+	<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing"><value>400, 22</value></data>
+	<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib"><value>0</value></data>
+</root>
diff --git a/OpenTween/OpenTween.csproj b/OpenTween/OpenTween.csproj
index 688af6852..a08f3638b 100644
--- a/OpenTween/OpenTween.csproj
+++ b/OpenTween/OpenTween.csproj
@@ -65,6 +65,12 @@
     <Compile Update="AtIdSupplement.Designer.cs">
       <DependentUpon>AtIdSupplement.cs</DependentUpon>
     </Compile>
+    <Compile Update="Controls\PublicSearchHeaderPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="Controls\PublicSearchHeaderPanel.Designer.cs">
+      <DependentUpon>PublicSearchHeaderPanel.cs</DependentUpon>
+    </Compile>
     <Compile Update="AppendSettingDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -334,6 +340,9 @@
     <EmbeddedResource Update="AuthDialog.resx">
       <DependentUpon>AuthDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Update="Controls\PublicSearchHeaderPanel.resx">
+      <DependentUpon>PublicSearchHeaderPanel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="EncryptApiKeyDialog.resx">
       <DependentUpon>EncryptApiKeyDialog.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 2067ad16b..576bfb1e6 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -55,6 +55,7 @@
 using OpenTween.Api.GraphQL;
 using OpenTween.Api.TwitterV2;
 using OpenTween.Connection;
+using OpenTween.Controls;
 using OpenTween.MediaUploadServices;
 using OpenTween.Models;
 using OpenTween.OpenTweenCustomControl;
@@ -2757,13 +2758,11 @@ public void AddNewTabForSearch(string searchWord)
             // 追加したタブをアクティブに
             this.ListTab.SelectedIndex = this.statuses.Tabs.Count - 1;
             // 検索条件の設定
-            var tabPage = this.CurrentTabPage;
-            var cmb = (ComboBox)tabPage.Controls["panelSearch"].Controls["comboSearch"];
-            cmb.Items.Add(searchWord);
-            cmb.Text = searchWord;
+            var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+            panel.Query = searchWord;
             this.SaveConfigsTabs();
             // 検索実行
-            this.SearchButton_Click(tabPage.Controls["panelSearch"].Controls["comboSearch"], EventArgs.Empty);
+            this.PublicSearchTabPanel_Search(panel, EventArgs.Empty);
         }
 
         private async Task ShowUserTimeline()
@@ -2780,14 +2779,10 @@ private async Task ShowRetweeterTimeline()
             await this.AddNewTabForUserTimeline(retweetedBy);
         }
 
-        private void SearchComboBox_KeyDown(object sender, KeyEventArgs e)
+        private void PublicSearchTabPanel_EscKeyDown(object sender, EventArgs e)
         {
-            if (e.KeyCode == Keys.Escape)
-            {
-                this.RemoveSpecifiedTab(this.CurrentTabName, false);
-                this.SaveConfigsTabs();
-                e.SuppressKeyPress = true;
-            }
+            this.RemoveSpecifiedTab(this.CurrentTabName, false);
+            this.SaveConfigsTabs();
         }
 
         public async Task AddNewTabForUserTimeline(string user)
@@ -2845,10 +2840,11 @@ public bool AddNewTab(TabModel tab, bool startup)
             {
                 tabPage.Controls.Add(listCustom);
 
+                Control? headerPanel = null;
+
                 // UserTimeline関連
                 var userTab = tab as UserTimelineTabModel;
                 var listTab = tab as ListTimelineTabModel;
-                var searchTab = tab as PublicSearchTabModel;
 
                 if (userTab != null || listTab != null)
                 {
@@ -2875,94 +2871,24 @@ public bool AddNewTab(TabModel tab, bool startup)
                     tabPage.Controls.Add(label);
                 }
                 // 検索関連の準備
-                else if (searchTab != null)
-                {
-                    var pnl = new Panel();
-
-                    var lbl = new Label();
-                    var cmb = new ComboBox();
-                    var btn = new Button();
-                    var cmbLang = new ComboBox();
-
-                    using (ControlTransaction.Layout(pnl, false))
-                    {
-                        pnl.Controls.Add(cmb);
-                        pnl.Controls.Add(cmbLang);
-                        pnl.Controls.Add(btn);
-                        pnl.Controls.Add(lbl);
-                        pnl.Name = "panelSearch";
-                        pnl.TabIndex = 0;
-                        pnl.Dock = DockStyle.Top;
-                        pnl.Height = cmb.Height;
-                        pnl.Enter += this.SearchControls_Enter;
-                        pnl.Leave += this.SearchControls_Leave;
-
-                        cmb.Text = "";
-                        cmb.Anchor = AnchorStyles.Left | AnchorStyles.Right;
-                        cmb.Dock = DockStyle.Fill;
-                        cmb.Name = "comboSearch";
-                        cmb.DropDownStyle = ComboBoxStyle.DropDown;
-                        cmb.ImeMode = ImeMode.NoControl;
-                        cmb.TabStop = false;
-                        cmb.TabIndex = 1;
-                        cmb.AutoCompleteMode = AutoCompleteMode.None;
-                        cmb.KeyDown += this.SearchComboBox_KeyDown;
-
-                        cmbLang.Text = "";
-                        cmbLang.Anchor = AnchorStyles.Left | AnchorStyles.Right;
-                        cmbLang.Dock = DockStyle.Right;
-                        cmbLang.Width = 50;
-                        cmbLang.Name = "comboLang";
-                        cmbLang.DropDownStyle = ComboBoxStyle.DropDownList;
-                        cmbLang.TabStop = false;
-                        cmbLang.TabIndex = 2;
-                        cmbLang.Items.Add("");
-                        cmbLang.Items.Add("ja");
-                        cmbLang.Items.Add("en");
-                        cmbLang.Items.Add("ar");
-                        cmbLang.Items.Add("da");
-                        cmbLang.Items.Add("nl");
-                        cmbLang.Items.Add("fa");
-                        cmbLang.Items.Add("fi");
-                        cmbLang.Items.Add("fr");
-                        cmbLang.Items.Add("de");
-                        cmbLang.Items.Add("hu");
-                        cmbLang.Items.Add("is");
-                        cmbLang.Items.Add("it");
-                        cmbLang.Items.Add("no");
-                        cmbLang.Items.Add("pl");
-                        cmbLang.Items.Add("pt");
-                        cmbLang.Items.Add("ru");
-                        cmbLang.Items.Add("es");
-                        cmbLang.Items.Add("sv");
-                        cmbLang.Items.Add("th");
-
-                        lbl.Text = "Search(C-S-f)";
-                        lbl.Name = "label1";
-                        lbl.Dock = DockStyle.Left;
-                        lbl.Width = 90;
-                        lbl.Height = cmb.Height;
-                        lbl.TextAlign = ContentAlignment.MiddleLeft;
-                        lbl.TabIndex = 0;
-
-                        btn.Text = "Search";
-                        btn.Name = "buttonSearch";
-                        btn.UseVisualStyleBackColor = true;
-                        btn.Dock = DockStyle.Right;
-                        btn.TabStop = false;
-                        btn.TabIndex = 3;
-                        btn.Click += this.SearchButton_Click;
-
-                        if (!MyCommon.IsNullOrEmpty(searchTab.SearchWords))
-                        {
-                            cmb.Items.Add(searchTab.SearchWords);
-                            cmb.Text = searchTab.SearchWords;
-                        }
+                else if (tab is PublicSearchTabModel searchTab)
+                {
+                    var panel = new PublicSearchHeaderPanel
+                    {
+                        Dock = DockStyle.Top,
+                        Query = searchTab.SearchWords,
+                        Lang = searchTab.SearchLang,
+                    };
 
-                        cmbLang.Text = searchTab.SearchLang;
+                    panel.EscKeyDown += this.PublicSearchTabPanel_EscKeyDown;
+                    panel.Search += this.PublicSearchTabPanel_Search;
 
-                        tabPage.Controls.Add(pnl);
-                    }
+                    headerPanel = panel;
+                }
+
+                if (headerPanel != null)
+                {
+                    tabPage.Controls.Add(headerPanel);
                 }
 
                 tabPage.Tag = listCustom;
@@ -3072,28 +2998,14 @@ public bool RemoveSpecifiedTab(string tabName, bool confirm)
                 {
                     using var label = tabPage.Controls["labelUser"];
                     tabPage.Controls.Remove(label);
+                    listCustom = (DetailsListView)tabPage.Tag;
                 }
                 else if (tabInfo.TabType == MyCommon.TabUsageType.PublicSearch)
                 {
-                    using var pnl = tabPage.Controls["panelSearch"];
-
-                    pnl.Enter -= this.SearchControls_Enter;
-                    pnl.Leave -= this.SearchControls_Leave;
-                    tabPage.Controls.Remove(pnl);
-
-                    foreach (Control ctrl in pnl.Controls)
-                    {
-                        if (ctrl.Name == "buttonSearch")
-                        {
-                            ctrl.Click -= this.SearchButton_Click;
-                        }
-                        else if (ctrl.Name == "comboSearch")
-                        {
-                            ctrl.KeyDown -= this.SearchComboBox_KeyDown;
-                        }
-                        pnl.Controls.Remove(ctrl);
-                        ctrl.Dispose();
-                    }
+                    using var panel = tabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+                    panel.EscKeyDown -= this.PublicSearchTabPanel_EscKeyDown;
+                    panel.Search -= this.PublicSearchTabPanel_Search;
+                    tabPage.Controls.Remove(panel);
                 }
 
                 tabPage.Controls.Remove(listCustom);
@@ -4165,10 +4077,9 @@ private async void ListTab_KeyDown(object sender, KeyEventArgs e)
             var tab = this.CurrentTab;
             if (tab.TabType == MyCommon.TabUsageType.PublicSearch)
             {
-                var pnl = this.CurrentTabPage.Controls["panelSearch"];
-                if (pnl.Controls["comboSearch"].Focused ||
-                    pnl.Controls["comboLang"].Focused ||
-                    pnl.Controls["buttonSearch"].Focused) return;
+                var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+                if (panel.ContainsFocus)
+                    return;
             }
 
             if (e.Control || e.Shift || e.Alt)
@@ -4602,7 +4513,11 @@ private void InitializeShortcuts()
 
                 ShortcutCommand.Create(Keys.Control | Keys.Shift | Keys.F)
                     .OnlyWhen(() => this.CurrentTab.TabType == MyCommon.TabUsageType.PublicSearch)
-                    .Do(() => this.CurrentTabPage.Controls["panelSearch"].Controls["comboSearch"].Focus()),
+                    .Do(() =>
+                    {
+                        var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+                        panel.FocusToQuery();
+                    }),
 
                 ShortcutCommand.Create(Keys.Control | Keys.Shift | Keys.L)
                     .Do(() => this.DoQuoteOfficial()),
@@ -6368,7 +6283,8 @@ private async void AddTabMenuItem_Click(object sender, EventArgs e)
                     if (tabUsage == MyCommon.TabUsageType.PublicSearch)
                     {
                         this.ListTab.SelectedIndex = tabIndex;
-                        this.CurrentTabPage.Controls["panelSearch"].Controls["comboSearch"].Focus();
+                        var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+                        panel.FocusToQuery();
                     }
                     if (tabUsage == MyCommon.TabUsageType.Lists)
                     {
@@ -6481,20 +6397,6 @@ protected override bool ProcessDialogKey(Keys keyData)
                         return true;
                     }
                 }
-                else
-                {
-                    var tab = this.CurrentTab;
-                    if (tab.TabType == MyCommon.TabUsageType.PublicSearch)
-                    {
-                        var tabPage = this.CurrentTabPage;
-                        if (tabPage.Controls["panelSearch"].Controls["comboSearch"].Focused ||
-                            tabPage.Controls["panelSearch"].Controls["comboLang"].Focused)
-                        {
-                            this.SearchButton_Click(tabPage.Controls["panelSearch"].Controls["comboSearch"], EventArgs.Empty);
-                            return true;
-                        }
-                    }
-                }
             }
 
             return base.ProcessDialogKey(keyData);
@@ -8518,25 +8420,23 @@ private void DoReTweetUnofficial()
         private void QuoteStripMenuItem_Click(object sender, EventArgs e)
             => this.DoQuoteOfficial();
 
-        private async void SearchButton_Click(object sender, EventArgs e)
+        private async void PublicSearchTabPanel_Search(object sender, EventArgs e)
         {
             // 公式検索
-            var pnl = ((Control)sender).Parent;
-            if (pnl == null) return;
-            var tbName = pnl.Parent.Text;
-            var tb = (PublicSearchTabModel)this.statuses.Tabs[tbName];
-            var cmb = (ComboBox)pnl.Controls["comboSearch"];
-            var cmbLang = (ComboBox)pnl.Controls["comboLang"];
-            cmb.Text = cmb.Text.Trim();
+            var tb = (PublicSearchTabModel)this.CurrentTab;
+            var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+            var query = panel.Query;
+            var lang = panel.Lang;
+
             // 検索式演算子 OR についてのみ大文字しか認識しないので強制的に大文字とする
             var quote = false;
             var buf = new StringBuilder();
-            var c = cmb.Text.ToCharArray();
-            for (var cnt = 0; cnt < cmb.Text.Length; cnt++)
+            var c = query.ToCharArray();
+            for (var cnt = 0; cnt < c.Length; cnt++)
             {
-                if (cnt > cmb.Text.Length - 4)
+                if (cnt > c.Length - 4)
                 {
-                    buf.Append(cmb.Text.Substring(cnt));
+                    buf.Append(query.Substring(cnt));
                     break;
                 }
                 if (c[cnt] == '"')
@@ -8545,7 +8445,7 @@ private async void SearchButton_Click(object sender, EventArgs e)
                 }
                 else
                 {
-                    if (!quote && cmb.Text.Substring(cnt, 4).Equals(" or ", StringComparison.OrdinalIgnoreCase))
+                    if (!quote && query.Substring(cnt, 4).Equals(" or ", StringComparison.OrdinalIgnoreCase))
                     {
                         buf.Append(" OR ");
                         cnt += 3;
@@ -8554,15 +8454,14 @@ private async void SearchButton_Click(object sender, EventArgs e)
                 }
                 buf.Append(c[cnt]);
             }
-            cmb.Text = buf.ToString();
-
-            var listView = (DetailsListView)pnl.Parent.Tag;
+            query = buf.ToString();
 
-            var queryChanged = tb.SearchWords != cmb.Text || tb.SearchLang != cmbLang.Text;
+            var listView = this.CurrentListView;
+            var queryChanged = tb.SearchWords != query || tb.SearchLang != lang;
 
-            tb.SearchWords = cmb.Text;
-            tb.SearchLang = cmbLang.Text;
-            if (MyCommon.IsNullOrEmpty(cmb.Text))
+            tb.SearchWords = query;
+            tb.SearchLang = lang;
+            if (MyCommon.IsNullOrEmpty(query))
             {
                 listView.Focus();
                 this.SaveConfigsTabs();
@@ -8570,12 +8469,7 @@ private async void SearchButton_Click(object sender, EventArgs e)
             }
             if (queryChanged)
             {
-                var idx = cmb.Items.IndexOf(tb.SearchWords);
-                if (idx > -1) cmb.Items.RemoveAt(idx);
-                cmb.Items.Insert(0, tb.SearchWords);
-                cmb.Text = tb.SearchWords;
-                cmb.SelectAll();
-                this.statuses.ClearTabIds(tbName);
+                this.statuses.ClearTabIds(tb.TabName);
                 this.listCache?.PurgeCache();
                 this.listCache?.UpdateListSize();
                 this.SaveConfigsTabs();   // 検索条件の保存
@@ -8645,29 +8539,13 @@ public void ListManageUserContext(string screenName)
             listSelectForm.ShowDialog(this);
         }
 
-        private void SearchControls_Enter(object sender, EventArgs e)
-        {
-            var pnl = (Control)sender;
-            foreach (Control ctl in pnl.Controls)
-            {
-                ctl.TabStop = true;
-            }
-        }
-
-        private void SearchControls_Leave(object sender, EventArgs e)
-        {
-            var pnl = (Control)sender;
-            foreach (Control ctl in pnl.Controls)
-            {
-                ctl.TabStop = false;
-            }
-        }
-
         private void PublicSearchQueryMenuItem_Click(object sender, EventArgs e)
         {
             var tab = this.CurrentTab;
             if (tab.TabType != MyCommon.TabUsageType.PublicSearch) return;
-            this.CurrentTabPage.Controls["panelSearch"].Controls["comboSearch"].Focus();
+
+            var panel = this.CurrentTabPage.Controls.OfType<PublicSearchHeaderPanel>().First();
+            panel.FocusToQuery();
         }
 
         private void StatusLabel_DoubleClick(object sender, EventArgs e)

From ee334088fd2cf5e3a48a5e96b33a4bb5af43d70b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 13 Apr 2022 03:11:32 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=83=BBList=E3=82=BF=E3=83=96=E3=81=AE=E3=83=98=E3=83=83?=
 =?UTF-8?q?=E3=83=80=E3=83=BC=E9=83=A8=E5=88=86=E3=82=92GeneralTimelineHea?=
 =?UTF-8?q?derPanel=E3=81=AB=E5=88=86=E9=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GeneralTimelineHeaderPanelTest.cs         | 34 ++++++++++++
 OpenTween.Tests/TweenMainTest.cs              |  8 +--
 .../GeneralTimelineHeaderPanel.Designer.cs    | 54 +++++++++++++++++++
 .../Controls/GeneralTimelineHeaderPanel.cs    | 53 ++++++++++++++++++
 .../Controls/GeneralTimelineHeaderPanel.resx  | 25 +++++++++
 OpenTween/OpenTween.csproj                    |  9 ++++
 OpenTween/Tween.cs                            | 40 +++++---------
 7 files changed, 193 insertions(+), 30 deletions(-)
 create mode 100644 OpenTween.Tests/Controls/GeneralTimelineHeaderPanelTest.cs
 create mode 100644 OpenTween/Controls/GeneralTimelineHeaderPanel.Designer.cs
 create mode 100644 OpenTween/Controls/GeneralTimelineHeaderPanel.cs
 create mode 100644 OpenTween/Controls/GeneralTimelineHeaderPanel.resx

diff --git a/OpenTween.Tests/Controls/GeneralTimelineHeaderPanelTest.cs b/OpenTween.Tests/Controls/GeneralTimelineHeaderPanelTest.cs
new file mode 100644
index 000000000..de5614376
--- /dev/null
+++ b/OpenTween.Tests/Controls/GeneralTimelineHeaderPanelTest.cs
@@ -0,0 +1,34 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General public License
+// for more details.
+//
+// You should have received a copy of the GNU General public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using Xunit;
+
+namespace OpenTween.Controls
+{
+    public class GeneralTimelineHeaderPanelTest
+    {
+        [WinFormsFact]
+        public void Initialize_Test()
+        {
+            using var panel = new GeneralTimelineHeaderPanel();
+        }
+    }
+}
diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index a2f50e6b5..7feab842b 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -110,8 +110,8 @@ public void AddNewTab_UserTimelineTabTest()
                 Assert.Equal(2, tabPage.Controls.Count);
                 Assert.IsType<DetailsListView>(tabPage.Controls[0]);
 
-                var label = Assert.IsType<Label>(tabPage.Controls[1]);
-                Assert.Equal("twitterapi's Timeline", label.Text);
+                var header = Assert.IsType<GeneralTimelineHeaderPanel>(tabPage.Controls[1]);
+                Assert.Equal("twitterapi's Timeline", header.HeaderText);
             });
         }
 
@@ -140,8 +140,8 @@ public void AddNewTab_ListTimelineTabTest()
                 Assert.Equal(2, tabPage.Controls.Count);
                 Assert.IsType<DetailsListView>(tabPage.Controls[0]);
 
-                var label = Assert.IsType<Label>(tabPage.Controls[1]);
-                Assert.Equal("@opentween/tetete [Protected]", label.Text);
+                var header = Assert.IsType<GeneralTimelineHeaderPanel>(tabPage.Controls[1]);
+                Assert.Equal("@opentween/tetete [Protected]", header.HeaderText);
             });
         }
 
diff --git a/OpenTween/Controls/GeneralTimelineHeaderPanel.Designer.cs b/OpenTween/Controls/GeneralTimelineHeaderPanel.Designer.cs
new file mode 100644
index 000000000..e5af858a4
--- /dev/null
+++ b/OpenTween/Controls/GeneralTimelineHeaderPanel.Designer.cs
@@ -0,0 +1,54 @@
+namespace OpenTween.Controls
+{
+    partial class GeneralTimelineHeaderPanel
+    {
+        /// <summary> 
+        /// 必要なデザイナー変数です。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 使用中のリソースをすべてクリーンアップします。
+        /// </summary>
+        /// <param name="disposing">マネージド リソースを破棄する場合は true を指定し、その他の場合は false を指定します。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region コンポーネント デザイナーで生成されたコード
+
+        /// <summary> 
+        /// デザイナー サポートに必要なメソッドです。このメソッドの内容を 
+        /// コード エディターで変更しないでください。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GeneralTimelineHeaderPanel));
+            this.labelHeader = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // labelHeader
+            // 
+            resources.ApplyResources(this.labelHeader, "labelHeader");
+            this.labelHeader.Name = "labelHeader";
+            // 
+            // GeneralTimelineHeaderPanel
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.Controls.Add(this.labelHeader);
+            this.Name = "GeneralTimelineHeaderPanel";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label labelHeader;
+    }
+}
diff --git a/OpenTween/Controls/GeneralTimelineHeaderPanel.cs b/OpenTween/Controls/GeneralTimelineHeaderPanel.cs
new file mode 100644
index 000000000..961b17f04
--- /dev/null
+++ b/OpenTween/Controls/GeneralTimelineHeaderPanel.cs
@@ -0,0 +1,53 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <kiri.feather@gmail.com>
+//           (c) 2008-2011 Moz (@syo68k)
+//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
+//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
+//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
+//           (c) 2011      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General public License
+// for more details.
+//
+// You should have received a copy of the GNU General public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+#nullable enable
+
+using System.Windows.Forms;
+
+namespace OpenTween.Controls
+{
+    public partial class GeneralTimelineHeaderPanel : UserControl
+    {
+        public string HeaderText
+        {
+            get => this.headerText;
+            set
+            {
+                this.headerText = value;
+                this.UpdateLabelUser();
+            }
+        }
+
+        private string headerText = "";
+
+        public GeneralTimelineHeaderPanel()
+            => this.InitializeComponent();
+
+        private void UpdateLabelUser()
+            => this.labelHeader.Text = this.headerText;
+    }
+}
diff --git a/OpenTween/Controls/GeneralTimelineHeaderPanel.resx b/OpenTween/Controls/GeneralTimelineHeaderPanel.resx
new file mode 100644
index 000000000..db07e6f61
--- /dev/null
+++ b/OpenTween/Controls/GeneralTimelineHeaderPanel.resx
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><root xml:space="preserve">
+	<resheader name="resmimetype"><value>text/microsoft-resx</value></resheader>
+	<resheader name="version"><value>2.0</value></resheader>
+	<resheader name="reader"><value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader>
+	<resheader name="writer"><value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader>
+	<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+	<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+
+	<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"><value>96, 96</value></data>
+	<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"><value>True</value></metadata>
+	<data name="$this.Size" type="System.Drawing.Size, System.Drawing"><value>400, 22</value></data>
+	<data name="&gt;&gt;$this.Name"><value>GeneralTimelineHeaderPanel</value></data>
+	<data name="&gt;&gt;$this.Type"><value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;labelHeader.Name"><value>labelHeader</value></data>
+	<data name="&gt;&gt;labelHeader.Parent"><value>$this</value></data>
+	<data name="&gt;&gt;labelHeader.Type"><value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></data>
+	<data name="&gt;&gt;labelHeader.ZOrder"><value>0</value></data>
+	<data name="labelHeader.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"><value>Fill</value></data>
+	<data name="labelHeader.Location" type="System.Drawing.Point, System.Drawing"><value>0, 0</value></data>
+	<data name="labelHeader.Size" type="System.Drawing.Size, System.Drawing"><value>400, 22</value></data>
+	<data name="labelHeader.TabIndex" type="System.Int32, mscorlib"><value>0</value></data>
+	<data name="labelHeader.Text"><value>labelHeader</value></data>
+	<data name="labelHeader.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing"><value>MiddleLeft</value></data>
+</root>
diff --git a/OpenTween/OpenTween.csproj b/OpenTween/OpenTween.csproj
index a08f3638b..f505d8aa3 100644
--- a/OpenTween/OpenTween.csproj
+++ b/OpenTween/OpenTween.csproj
@@ -71,6 +71,12 @@
     <Compile Update="Controls\PublicSearchHeaderPanel.Designer.cs">
       <DependentUpon>PublicSearchHeaderPanel.cs</DependentUpon>
     </Compile>
+    <Compile Update="Controls\GeneralTimelineHeaderPanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Update="Controls\GeneralTimelineHeaderPanel.Designer.cs">
+      <DependentUpon>GeneralTimelineHeaderPanel.cs</DependentUpon>
+    </Compile>
     <Compile Update="AppendSettingDialog.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -343,6 +349,9 @@
     <EmbeddedResource Update="Controls\PublicSearchHeaderPanel.resx">
       <DependentUpon>PublicSearchHeaderPanel.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Update="Controls\GeneralTimelineHeaderPanel.resx">
+      <DependentUpon>GeneralTimelineHeaderPanel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Update="EncryptApiKeyDialog.resx">
       <DependentUpon>EncryptApiKeyDialog.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 576bfb1e6..d643b99a9 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -2842,33 +2842,21 @@ public bool AddNewTab(TabModel tab, bool startup)
 
                 Control? headerPanel = null;
 
-                // UserTimeline関連
-                var userTab = tab as UserTimelineTabModel;
-                var listTab = tab as ListTimelineTabModel;
-
-                if (userTab != null || listTab != null)
+                if (tab is UserTimelineTabModel userTab)
                 {
-                    var label = new Label
+                    headerPanel = new GeneralTimelineHeaderPanel
                     {
                         Dock = DockStyle.Top,
-                        Name = "labelUser",
-                        TabIndex = 0,
+                        HeaderText = $"{userTab.ScreenName}'s Timeline",
                     };
-
-                    if (listTab != null)
-                    {
-                        label.Text = listTab.ListInfo.ToString();
-                    }
-                    else if (userTab != null)
-                    {
-                        label.Text = userTab.ScreenName + "'s Timeline";
-                    }
-                    label.TextAlign = ContentAlignment.MiddleLeft;
-                    using (var tmpComboBox = new ComboBox())
+                }
+                else if (tab is ListTimelineTabModel listTab)
+                {
+                    headerPanel = new GeneralTimelineHeaderPanel
                     {
-                        label.Height = tmpComboBox.Height;
-                    }
-                    tabPage.Controls.Add(label);
+                        Dock = DockStyle.Top,
+                        HeaderText = listTab.ListInfo.ToString(),
+                    };
                 }
                 // 検索関連の準備
                 else if (tab is PublicSearchTabModel searchTab)
@@ -2994,11 +2982,11 @@ public bool RemoveSpecifiedTab(string tabName, bool confirm)
                 this.ListTab.Controls.Remove(tabPage);
 
                 // 後付けのコントロールを破棄
-                if (tabInfo.TabType == MyCommon.TabUsageType.UserTimeline || tabInfo.TabType == MyCommon.TabUsageType.Lists)
+                if (tabInfo.TabType == MyCommon.TabUsageType.UserTimeline ||
+                    tabInfo.TabType == MyCommon.TabUsageType.Lists)
                 {
-                    using var label = tabPage.Controls["labelUser"];
-                    tabPage.Controls.Remove(label);
-                    listCustom = (DetailsListView)tabPage.Tag;
+                    using var panel = tabPage.Controls.OfType<GeneralTimelineHeaderPanel>().First();
+                    tabPage.Controls.Remove(panel);
                 }
                 else if (tabInfo.TabType == MyCommon.TabUsageType.PublicSearch)
                 {