Improved autocomplete closing after pressing enter (win)

toggl-open-source · Jun 6, 2018 · 45b29e1 · 45b29e1
1 parent a3a5dce
commit 45b29e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/AutoCompletion/AutoCompleteController.cs b/src/ui/windows/TogglDesktop/TogglDesktop/AutoCompletion/AutoCompleteController.cs
@@ -319,7 +319,7 @@ private void selectIndex(int index)
 
         public void SelectNext()
         {
-            if (this.visibleItems.Count == 0)
+            if (this.visibleItems == null || this.visibleItems.Count == 0)
                 return;
 
             var i = this.selectedIndex + 1;
@@ -341,7 +341,7 @@ public void SelectNext()
 
         public void SelectPrevious()
         {
-            if (this.visibleItems.Count == 0)
+            if (this.visibleItems == null || this.visibleItems.Count == 0)
                 return;
 
             var i = this.selectedIndex - 1;

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/AutoCompletionPopup.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/controls/AutoCompletionPopup.xaml.cs
@@ -274,7 +274,11 @@ private void textboxOnPreviewKeyDown(object sender, KeyEventArgs e)
                         if (this.IsOpen)
                         {
                             if (this.confirmCompletion())
+                            {
                                 e.Handled = true;
+                            }
+
+                            this.close();
                         }
                         return;
                     }