From 314f2d6a9077d7dc6f99656bcd2ccea8994dcf1d Mon Sep 17 00:00:00 2001
From: Sparrkle <twilymoomoo@gmail.com>
Date: Thu, 15 Sep 2022 15:57:05 +0900
Subject: [PATCH] Fixed Progressbar Binding Error (ProgressBar Value is Not
 Nullable)

---
 Flow.Launcher.Plugin/Result.cs                            | 7 ++++++-
 Flow.Launcher/ResultListBox.xaml                          | 2 +-
 Flow.Launcher/Themes/Base.xaml                            | 8 +++-----
 .../Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs | 5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 136395467..f8c2c391f 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -201,7 +201,12 @@ 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? ProgressBar { get; set; }
+        public int ProgressBarValue { get; set; }
+
+        /// <summary>
+        /// Progress bar visibility Check
+        /// </summary>
+        public bool IsProgressBarVisible { get; set; } = false;
 
         /// <summary>
         /// Optionally set the color of the progress bar
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 2c78f9bab..be8bdde41 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -115,7 +115,7 @@
                                 x:Name="progressbarResult"
                                 Foreground="{Binding Result.ProgressBarColor}"
                                 Style="{DynamicResource ProgressBarResult}"
-                                Value="{Binding Result.ProgressBar}" />
+                                Value="{Binding Result.ProgressBarValue}" />
                             <TextBlock
                                 x:Name="Title"
                                 VerticalAlignment="Center"
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index dbd5b31c1..bcd3b3c16 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -4,6 +4,8 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
 
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
         <Setter Property="BorderThickness" Value="0" />
@@ -89,11 +91,7 @@
         <Setter Property="Minimum" Value="0" />
         <Setter Property="Visibility" Value="Visible" />
         <Setter Property="Foreground" Value="#26a0da " />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
-                <Setter Property="Visibility" Value="Collapsed" />
-            </DataTrigger>
-        </Style.Triggers>
+        <Setter Property="Visibility" Value="{Binding Result.IsProgressBarVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>
     </Style>
 
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 2b8b010c0..b48b6ef01 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -80,7 +80,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
         internal static Result CreateDriveSpaceDisplayResult(string path, bool windowsIndexed = false)
         {
             var progressBarColor = "#26a0da";
-            int? progressValue = null;
+            int progressValue = 0;
             var title = string.Empty; // hide title when use progress bar,
             var driveLetter = path.Substring(0, 1).ToUpper();
             var driveName = driveLetter + ":\\";
@@ -100,7 +100,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search
                 AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
                 IcoPath = path,
                 Score = 500,
-                ProgressBar = progressValue,
+                ProgressBarValue = progressValue,
+                IsProgressBarVisible = true,
                 ProgressBarColor = progressBarColor,
                 Action = c =>
                 {