From 239c9d7a93b08c5a575d9dd1837d2973b15f0086 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 30 Aug 2022 04:26:22 -0400 Subject: [PATCH 01/36] Add field to control if Icon uses rounded mask --- Flow.Launcher.Plugin/Result.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs index 35c491d35..a9dda4ff4 100644 --- a/Flow.Launcher.Plugin/Result.cs +++ b/Flow.Launcher.Plugin/Result.cs @@ -66,6 +66,10 @@ namespace Flow.Launcher.Plugin } } } + /// + /// Determines if Icon has a border radius + /// + public bool RoundedIcon { get; set; } = false; /// /// Delegate function, see From 70ea6a89e3b8bff59a0b1c122102d54c322df3f6 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 30 Aug 2022 04:27:17 -0400 Subject: [PATCH 02/36] Remove Icon X & Y hard coded dependency --- Flow.Launcher/ResultListBox.xaml | 4 ++-- Flow.Launcher/ViewModel/ResultViewModel.cs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml index 2a7f9c494..3728b868d 100644 --- a/Flow.Launcher/ResultListBox.xaml +++ b/Flow.Launcher/ResultListBox.xaml @@ -82,8 +82,8 @@ BorderThickness="0"> Date: Tue, 30 Aug 2022 04:27:37 -0400 Subject: [PATCH 03/36] Add clip mask --- Flow.Launcher/ResultListBox.xaml | 6 +++++- Flow.Launcher/ViewModel/ResultViewModel.cs | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml index 3728b868d..e4051c536 100644 --- a/Flow.Launcher/ResultListBox.xaml +++ b/Flow.Launcher/ResultListBox.xaml @@ -88,7 +88,11 @@ HorizontalAlignment="Center" Source="{Binding Image, TargetNullValue={x:Null}}" Stretch="Uniform" - Visibility="{Binding ShowIcon}" /> + Visibility="{Binding ShowIcon}"> + + + + Date: Tue, 6 Sep 2022 23:59:33 +0900 Subject: [PATCH 04/36] - Add 'Free Space in drive' - when Type "d:\", showing graph with free space. --- Flow.Launcher.Plugin/Result.cs | 2 + Flow.Launcher/ResultListBox.xaml | 9 +-- Flow.Launcher/Themes/Base.xaml | 15 ++++ .../Search/ResultManager.cs | 70 ++++++++++++++++--- 4 files changed, 82 insertions(+), 14 deletions(-) diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs index 35c491d35..f3f3d2816 100644 --- a/Flow.Launcher.Plugin/Result.cs +++ b/Flow.Launcher.Plugin/Result.cs @@ -197,5 +197,7 @@ namespace Flow.Launcher.Plugin { return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false); } + + public int? ProgressBar { get; set; } } } diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml index 2a7f9c494..4c1b068f8 100644 --- a/Flow.Launcher/ResultListBox.xaml +++ b/Flow.Launcher/ResultListBox.xaml @@ -111,7 +111,10 @@ - + - - + ToolTip="{Binding ShowSubTitleToolTip}" /> diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index 087606d04..dbd5b31c1 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -81,6 +81,21 @@ + + + - - - - - - - - - - - #356ef3 + #19ffffff - - - - + - - - - - - - - - - - #356ef3 + #19c9c9c9 - - - - - + - + + - + + + + + - - - - - - #356ef3 - - - - - + - - - - - - - - - + + #192026 - - - - - - - + - - - - #198F8F8F - - - - - - - From f0d6961ede622e816168c7540d53f2e79c32883e Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Thu, 29 Sep 2022 14:00:53 +0800 Subject: [PATCH 32/36] Remove all Segoe UI usage. --- Flow.Launcher/ActionKeywords.xaml | 1 - Flow.Launcher/CustomQueryHotkeySetting.xaml | 1 - Flow.Launcher/PriorityChangeWindow.xaml | 1 - Flow.Launcher/Resources/CustomControlTemplate.xaml | 1 - Flow.Launcher/SelectBrowserWindow.xaml | 1 - Flow.Launcher/SelectFileManagerWindow.xaml | 1 - .../Views/CustomBrowserSetting.xaml | 1 - .../Views/ActionKeywordSetting.xaml | 1 - Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml | 1 - Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml | 1 - Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml | 1 - 11 files changed, 11 deletions(-) diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml index e94aac9f6..740b0d402 100644 --- a/Flow.Launcher/ActionKeywords.xaml +++ b/Flow.Launcher/ActionKeywords.xaml @@ -58,7 +58,6 @@ diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml index 98bc391dd..88fd581b4 100644 --- a/Flow.Launcher/SelectBrowserWindow.xaml +++ b/Flow.Launcher/SelectBrowserWindow.xaml @@ -62,7 +62,6 @@ Date: Thu, 29 Sep 2022 17:35:32 +0900 Subject: [PATCH 33/36] Fix Blurry Context menu in querybox --- Flow.Launcher/Resources/CustomControlTemplate.xaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index b4d7e78a7..b3993fb8c 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -2724,7 +2724,8 @@ Background="{DynamicResource CustomContextBackground}" BorderBrush="{DynamicResource CustomContextBorder}" BorderThickness="1" - CornerRadius="8"> + CornerRadius="8" + UseLayoutRounding="True"> Date: Fri, 30 Sep 2022 09:58:33 +0900 Subject: [PATCH 34/36] 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 /// /// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result /// - public int ProgressBarValue { get; set; } - - /// - /// Progress bar visibility Check - /// - public bool IsProgressBarVisible { get; set; } = false; + public int? ProgressBar { get; set; } /// /// 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"> - - - -