AppliAppliStation-GUI,検索バーの更新(Deleteキーとか押した時など)がうまくいかないバグ対策

git-svn-id: http://localhost/svn/AppliStation/trunk@871 34ed2c89-c49f-4a4b-abdb-c318350108cf

diff --git a/AppliStation/PackageListViewForm.Designer.cs b/AppliStation/PackageListViewForm.Designer.cs
index 0a0abfa..cbf6bcb 100644 (file)
--- a/AppliStation/PackageListViewForm.Designer.cs
+++ b/AppliStation/PackageListViewForm.Designer.cs
@@ -108,7 +108,7 @@
                                                                        this.searchTextBox});\r
                        this.packageListFilterToolStrip.Location = new System.Drawing.Point(3, 0);\r
                        this.packageListFilterToolStrip.Name = "packageListFilterToolStrip";\r
-                       this.packageListFilterToolStrip.Size = new System.Drawing.Size(177, 25);\r
+                       this.packageListFilterToolStrip.Size = new System.Drawing.Size(206, 25);\r
                        this.packageListFilterToolStrip.TabIndex = 1;\r
                        // \r
                        // packageFilterToolStripDropDownButton\r
@@ -124,7 +124,7 @@
                        // allPackageFilterToolStripMenuItem\r
                        // \r
                        this.allPackageFilterToolStripMenuItem.Name = "allPackageFilterToolStripMenuItem";\r
-                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);\r
+                       this.allPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.allPackageFilterToolStripMenuItem.Text = "全て";\r
                        this.allPackageFilterToolStripMenuItem.ToolTipText = "全てのソフトを表示";\r
                        this.allPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -132,7 +132,7 @@
                        // notInstalledPackageFilterToolStripMenuItem\r
                        // \r
                        this.notInstalledPackageFilterToolStripMenuItem.Name = "notInstalledPackageFilterToolStripMenuItem";\r
-                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);\r
+                       this.notInstalledPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.notInstalledPackageFilterToolStripMenuItem.Text = "未インストール";\r
                        this.notInstalledPackageFilterToolStripMenuItem.ToolTipText = "インストールされていないソフトを表示";\r
                        this.notInstalledPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -140,7 +140,7 @@
                        // installedASPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedASPackageFilterToolStripMenuItem.Name = "installedASPackageFilterToolStripMenuItem";\r
-                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);\r
+                       this.installedASPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.installedASPackageFilterToolStripMenuItem.Text = "AppliStation内";\r
                        this.installedASPackageFilterToolStripMenuItem.ToolTipText = "AppliStationにインストールされているソフトを表示";\r
                        this.installedASPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -148,7 +148,7 @@
                        // installedSysPackageFilterToolStripMenuItem\r
                        // \r
                        this.installedSysPackageFilterToolStripMenuItem.Name = "installedSysPackageFilterToolStripMenuItem";\r
-                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(144, 22);\r
+                       this.installedSysPackageFilterToolStripMenuItem.Size = new System.Drawing.Size(152, 22);\r
                        this.installedSysPackageFilterToolStripMenuItem.Text = "コンピュータ内";\r
                        this.installedSysPackageFilterToolStripMenuItem.ToolTipText = "コンピュータにインストールされているソフトを表示";\r
                        this.installedSysPackageFilterToolStripMenuItem.Click += new System.EventHandler(this.AnyPackageFilterToolStripMenuItemClicked);\r
@@ -164,6 +164,7 @@
                        this.searchTextBox.Enter += new System.EventHandler(this.SearchTextBoxEnter);\r
                        this.searchTextBox.Leave += new System.EventHandler(this.SearchTextBoxLeave);\r
                        this.searchTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.SearchTextBoxKeyPress);\r
+                       this.searchTextBox.TextChanged += new System.EventHandler(this.SearchTextBoxTextChanged);\r
                        // \r
                        // packageCommandsToolStrip\r
                        // \r
@@ -175,7 +176,7 @@
                                                                        this.uninstallToolStripButton});\r
                        this.packageCommandsToolStrip.Location = new System.Drawing.Point(3, 25);\r
                        this.packageCommandsToolStrip.Name = "packageCommandsToolStrip";\r
-                       this.packageCommandsToolStrip.Size = new System.Drawing.Size(223, 25);\r
+                       this.packageCommandsToolStrip.Size = new System.Drawing.Size(221, 25);\r
                        this.packageCommandsToolStrip.TabIndex = 2;\r
                        // \r
                        // updateToolStripButton\r

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 66e5c56..8d4ebc6 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -331,6 +331,13 @@ namespace AppliStation
                        }\r
                }\r
                \r
+               void SearchTextBoxTextChanged(object sender, EventArgs e)\r
+               {\r
+                       if (searchTextBox.Focused) {\r
+                               searchTextBoxUpdate(false);\r
+                       }\r
+               }\r
+               \r
                void SearchTextBoxKeyPress(object sender, KeyPressEventArgs e)\r
                {\r
                        switch (e.KeyChar) {\r
@@ -339,10 +346,6 @@ namespace AppliStation
                                        break;\r
                                case (char)Keys.Escape:\r
                                        searchTextBox.Text = "";\r
-                                       searchTextBoxUpdate(false);\r
-                                       break;\r
-                               default:\r
-                                       searchTextBoxUpdate(false);\r
                                        break;\r
                        }\r
                }\r
@@ -364,6 +367,7 @@ namespace AppliStation
                private void searchUpdateTimerTick(object sender, EventArgs e)\r
                {\r
                        searchUpdateTimer.Stop();\r
+                       searchUpdateTimer = null;\r
                        \r
                        PackageListViewUpdate();\r
                }\r