From ab1ddbb6c5741c609108d997cd9f0c5b5eb1e8ea Mon Sep 17 00:00:00 2001
From: Sparrkle <twilymoomoo@gmail.com>
Date: Fri, 30 Sep 2022 09:58:33 +0900
Subject: [PATCH] Change ProgressBar Value to Nullable.

---
 Flow.Launcher.Plugin/Result.cs                |  7 +------
 Flow.Launcher/ResultListBox.xaml              | 19 ++++++++++++-------
 Flow.Launcher/ViewModel/ResultViewModel.cs    | 10 ++++++++++
 .../Search/ResultManager.cs                   |  3 +--
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index f8c2c391f..136395467 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -201,12 +201,7 @@ namespace Flow.Launcher.Plugin
         /// <summary>
         /// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result
         /// </summary>
-        public int ProgressBarValue { get; set; }
-
-        /// <summary>
-        /// Progress bar visibility Check
-        /// </summary>
-        public bool IsProgressBarVisible { get; set; } = false;
+        public int? ProgressBar { get; set; }
 
         /// <summary>
         /// Optionally set the color of the progress bar
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 16f2555a9..80a4fc720 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -28,10 +28,6 @@
     mc:Ignorable="d">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
-    <ListBox.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    </ListBox.Resources>
-    
     <ListBox.ItemTemplate>
         <DataTemplate>
             <Button HorizontalAlignment="Stretch">
@@ -118,9 +114,18 @@
                             <ProgressBar
                                 x:Name="progressbarResult"
                                 Foreground="{Binding Result.ProgressBarColor}"
-                                Style="{DynamicResource ProgressBarResult}"
-                                Value="{Binding Result.ProgressBarValue}"
-                                Visibility="{Binding Result.IsProgressBarVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                                Value="{Binding ResultProgress, Mode=OneWay}">
+                                <ProgressBar.Style>
+                                    <Style TargetType="ProgressBar" BasedOn="{StaticResource ProgressBarResult}">
+                                        <Setter Property="Visibility" Value="Visible"/>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
+                                                <Setter Property="Visibility" Value="Collapsed"/>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ProgressBar.Style>
+                            </ProgressBar>
                             <TextBlock
                                 x:Name="Title"
                                 VerticalAlignment="Center"
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index 4d32d792d..aba50bf57 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -162,6 +162,16 @@ namespace Flow.Launcher.ViewModel
         }
 
         public Result Result { get; }
+        public int ResultProgress
+        {
+            get
+            {
+                if (Result.ProgressBar == null)
+                    return 0;
+
+                return Result.ProgressBar.Value;
+            }
+        }
 
         public string QuerySuggestionText { get; set; }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index b48b6ef01..d6d382e9a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -100,8 +100,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
                 IcoPath = path,
                 Score = 500,
-                ProgressBarValue = progressValue,
-                IsProgressBarVisible = true,
+                ProgressBar = progressValue,
                 ProgressBarColor = progressBarColor,
                 Action = c =>
                 {