タブキーでも補完できるようにした

diff --git a/UWP/FooEditEngine.UWP/AutoCompleteBox.cs b/UWP/FooEditEngine.UWP/AutoCompleteBox.cs
index ee90eee..75cf215 100644 (file)
--- a/UWP/FooEditEngine.UWP/AutoCompleteBox.cs
+++ b/UWP/FooEditEngine.UWP/AutoCompleteBox.cs
@@ -101,6 +101,7 @@ namespace FooEditEngine.UWP
                     this.listBox1.ScrollIntoView(this.listBox1.SelectedItem);
                     e.Handled = true;
                     return true;
+                case VirtualKey.Tab:
                 case VirtualKey.Enter:
                     this.RequestCloseCompleteBox();
                     CompleteWord selWord = (CompleteWord)this.listBox1.SelectedItem;

diff --git a/WPF/FooEditEngine/AutoCompleteBox.cs b/WPF/FooEditEngine/AutoCompleteBox.cs
index 0888a40..2d460ae 100644 (file)
--- a/WPF/FooEditEngine/AutoCompleteBox.cs
+++ b/WPF/FooEditEngine/AutoCompleteBox.cs
@@ -137,6 +137,7 @@ namespace FooEditEngine.WPF
                     this.listBox1.ScrollIntoView(this.listBox1.SelectedItem);
                     e.Handled = true;
                     return true;
+                case Key.Tab:
                 case Key.Enter:
                     this.RequestCloseCompleteBox();
                     CompleteWord selWord = (CompleteWord)this.listBox1.SelectedItem;

diff --git a/WPF/Test/MainWindow.xaml.cs b/WPF/Test/MainWindow.xaml.cs
index bf6ee18..cc90bd2 100644 (file)
--- a/WPF/Test/MainWindow.xaml.cs
+++ b/WPF/Test/MainWindow.xaml.cs
@@ -52,6 +52,7 @@ namespace Test
             Document doc = new Document();
             doc.AutoComplete = new AutoCompleteBox(doc);
             doc.AutoComplete.Items = complete_collection;
+            doc.AutoComplete.Enabled = true;
 
             this.fooTextBox.Document = doc;
 

diff --git a/Windows/FooEditEngine/AutoCompleteBox.cs b/Windows/FooEditEngine/AutoCompleteBox.cs
index 6c383db..2d30382 100644 (file)
--- a/Windows/FooEditEngine/AutoCompleteBox.cs
+++ b/Windows/FooEditEngine/AutoCompleteBox.cs
@@ -87,7 +87,7 @@ namespace FooEditEngine.Windows
             {
                 this.OpenCompleteBox(string.Empty);
                 return true;
-            } else if (!this.IsCloseCompleteBox && e.KeyChar == '\r'){
+            } else if (!this.IsCloseCompleteBox && (e.KeyChar == '\r')){
                 this.RequestCloseCompleteBox();
                 CompleteWord selWord = (CompleteWord)this.listBox1.SelectedItem;
                 this.SelectItem(this, new SelectItemEventArgs(selWord.word, this.inputedWord, this.Document));
@@ -129,6 +129,12 @@ namespace FooEditEngine.Windows
                     else
                         this.listBox1.SelectedIndex--;
                     return true;
+                case Keys.Tab:
+                    this.RequestCloseCompleteBox();
+                    CompleteWord selWord = (CompleteWord)this.listBox1.SelectedItem;
+                    this.SelectItem(this, new SelectItemEventArgs(selWord.word, this.inputedWord, this.Document));
+                    textbox.Refresh();
+                    return true;
             }
 
             return false;

diff --git a/Windows/Test/Form1.cs b/Windows/Test/Form1.cs
index d4c86f9..ebab1c3 100644 (file)
--- a/Windows/Test/Form1.cs
+++ b/Windows/Test/Form1.cs
@@ -27,6 +27,7 @@ namespace Test.Windows
             collection.Add(new CompleteWord("byte"));
             collection.Add(new CompleteWord("char"));
             this.fooTextBox1.Document.AutoComplete.Items = collection;
+            this.fooTextBox1.Document.AutoComplete.Enabled = true;
         }
 
         private void button1_Click(object sender, EventArgs e)