Merge branch 'dev' into OpenRecycleBinCommand

Author: onesounds

Flow.Launcher/Converters/OpenResultHotkeyVisibilityConverter.cs

@@ -11,17 +11,17 @@ namespace Flow.Launcher.Converters
     [ValueConversion(typeof(bool), typeof(Visibility))]
     public class OpenResultHotkeyVisibilityConverter : IValueConverter
     {
-        private const int MaxVisibleHotkeys = 9;
+        private const int MaxVisibleHotkeys = 10;
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var hotkeyNumber = int.MaxValue;
+            var number = int.MaxValue;
 
             if (value is ListBoxItem listBoxItem
                 && ItemsControl.ItemsControlFromItemContainer(listBoxItem) is ListBox listBox)
-                hotkeyNumber = listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
+                number = listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
 
-            return hotkeyNumber <= MaxVisibleHotkeys ? Visibility.Visible : Visibility.Collapsed;
+            return number <= MaxVisibleHotkeys ? Visibility.Visible : Visibility.Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();

Flow.Launcher/Converters/OrdinalConverter.cs

@@ -10,7 +10,10 @@ public object Convert(object value, System.Type targetType, object parameter, Cu
         {
             if (value is ListBoxItem listBoxItem
                 && ItemsControl.ItemsControlFromItemContainer(listBoxItem) is ListBox listBox)
-                return listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
+            {
+                var res = listBox.ItemContainerGenerator.IndexFromContainer(listBoxItem) + 1;
+                return res == 10 ? 0 : res;  // 10th item => HOTKEY+0
+            }
 
             return 0;
         }

Flow.Launcher/MainWindow.xaml

@@ -150,6 +150,11 @@
             Command="{Binding OpenResultCommand}"
             CommandParameter="8"
             Modifiers="{Binding OpenResultCommandModifiers}" />
+        <KeyBinding
+            Key="D0"
+            Command="{Binding OpenResultCommand}"
+            CommandParameter="9"
+            Modifiers="{Binding OpenResultCommandModifiers}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">

Flow.Launcher/MainWindow.xaml.cs

@@ -138,22 +138,20 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                         }
                     case nameof(MainViewModel.ProgressBarVisibility):
                         {
-                            Dispatcher.Invoke(async () =>
+                            Dispatcher.Invoke(() =>
                             {
                                 if (_viewModel.ProgressBarVisibility == Visibility.Hidden && !isProgressBarStoryboardPaused)
                                 {
-                                    await Task.Delay(50);
                                     _progressBarStoryboard.Stop(ProgressBar);
                                     isProgressBarStoryboardPaused = true;
                                 }
                                 else if (_viewModel.MainWindowVisibilityStatus &&
-                                         isProgressBarStoryboardPaused)
+                                            isProgressBarStoryboardPaused)
                                 {
                                     _progressBarStoryboard.Begin(ProgressBar, true);
                                     isProgressBarStoryboardPaused = false;
                                 }
-                            }, System.Windows.Threading.DispatcherPriority.Render);
-
+                            });
                             break;
                         }
                     case nameof(MainViewModel.QueryTextCursorMovedToEnd):