From c06fdb9134da07c0a6ad989847f3196e5d8f82db Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Sat, 14 Jun 2025 20:35:09 +0800 Subject: [PATCH 1/5] Set topmost default value to false --- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 975609e0f..33f7c5fc2 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -383,7 +383,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public bool LeaveCmdOpen { get; set; } public bool HideWhenDeactivated { get; set; } = true; - private bool _showAtTopmost = true; + private bool _showAtTopmost = false; public bool ShowAtTopmost { get => _showAtTopmost; From d9a30f6450705d3aed34d8e6a87adf8e19de7f58 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Sat, 14 Jun 2025 22:56:08 +1000 Subject: [PATCH 2/5] add skip build on tag --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b38e5bb1a..a430b28f4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,8 @@ version: '1.20.1.{build}' +# Do not build on tags because we create a release on merge to master. Otherwise will upload artifacts twice changing the hash, as well as triggering duplicate GitHub release action & NuGet deployments. +skip_tags: true + init: - ps: | $version = new-object System.Version $env:APPVEYOR_BUILD_VERSION @@ -14,7 +17,6 @@ init: cache: - '%USERPROFILE%\.nuget\packages -> **.sln, **.csproj' # preserve nuget folder (packages) unless the solution or projects change - assembly_info: patch: true file: SolutionAssemblyInfo.cs From f30c6fc577c9fd60ee2de0db6f275847c2ff8f4c Mon Sep 17 00:00:00 2001 From: DB P Date: Sat, 14 Jun 2025 22:19:31 +0900 Subject: [PATCH 3/5] Modified strings and added BoolNegationConverter --- .../Converters/BoolNegationConverter.cs | 23 +++++++++++++++ Flow.Launcher/Languages/en.xaml | 4 +-- .../Views/SettingsPaneGeneral.xaml | 28 ++++++++++--------- 3 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 Flow.Launcher/Converters/BoolNegationConverter.cs diff --git a/Flow.Launcher/Converters/BoolNegationConverter.cs b/Flow.Launcher/Converters/BoolNegationConverter.cs new file mode 100644 index 000000000..50a5c0f34 --- /dev/null +++ b/Flow.Launcher/Converters/BoolNegationConverter.cs @@ -0,0 +1,23 @@ +using System; +using System.Globalization; +using System.Windows.Data; + +namespace Flow.Launcher.Converters +{ + public class BoolNegationConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is bool b) + return !b; + return value; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value is bool b) + return !b; + return value; + } + } +} diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index f7f8dfd42..4df6b3155 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -131,8 +131,8 @@ Show History Results in Home Page Maximum History Results Shown in Home Page This can only be edited if plugin supports Home feature and Home Page is enabled. - Show Search Window at Topmost - Show search window above other windows + Keep on top + Keeps the search window on top even after it loses focus. Search Plugin diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml index e8ae0dc3c..ae1648076 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml @@ -17,6 +17,7 @@ mc:Ignorable="d"> + - - + + - + + + + + - - - From 27daffe515319317682afb263e532fdd11e221b2 Mon Sep 17 00:00:00 2001 From: DB P Date: Sat, 14 Jun 2025 23:26:08 +0900 Subject: [PATCH 4/5] Revert "Modified strings and added BoolNegationConverter" This reverts commit f30c6fc577c9fd60ee2de0db6f275847c2ff8f4c. --- .../Converters/BoolNegationConverter.cs | 23 --------------- Flow.Launcher/Languages/en.xaml | 4 +-- .../Views/SettingsPaneGeneral.xaml | 28 +++++++++---------- 3 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 Flow.Launcher/Converters/BoolNegationConverter.cs diff --git a/Flow.Launcher/Converters/BoolNegationConverter.cs b/Flow.Launcher/Converters/BoolNegationConverter.cs deleted file mode 100644 index 50a5c0f34..000000000 --- a/Flow.Launcher/Converters/BoolNegationConverter.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Globalization; -using System.Windows.Data; - -namespace Flow.Launcher.Converters -{ - public class BoolNegationConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is bool b) - return !b; - return value; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value is bool b) - return !b; - return value; - } - } -} diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 4df6b3155..f7f8dfd42 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -131,8 +131,8 @@ Show History Results in Home Page Maximum History Results Shown in Home Page This can only be edited if plugin supports Home feature and Home Page is enabled. - Keep on top - Keeps the search window on top even after it loses focus. + Show Search Window at Topmost + Show search window above other windows Search Plugin diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml index ae1648076..e8ae0dc3c 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml @@ -17,7 +17,6 @@ mc:Ignorable="d"> - - - - + - - - - - + + + + From 4c7f966e7c2af0ee7d231a0422dc3b8831fafc7d Mon Sep 17 00:00:00 2001 From: DB P Date: Sat, 14 Jun 2025 23:55:34 +0900 Subject: [PATCH 5/5] UI improvement and text update - en.xaml: Updated "showAtTopmost" and tooltip text - SettingsPaneGeneral.xaml: Added "Hide Notify Icon" card and updated icon - Adjusted card group margins --- Flow.Launcher/Languages/en.xaml | 4 ++-- Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index f7f8dfd42..bd4cbd282 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -131,8 +131,8 @@ Show History Results in Home Page Maximum History Results Shown in Home Page This can only be edited if plugin supports Home feature and Home Page is enabled. - Show Search Window at Topmost - Show search window above other windows + Show Search Window at Foremost + Overrides other programs' 'Always on Top' setting and displays Flow in the foremost position. Search Plugin diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml index e8ae0dc3c..7f8555d65 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml @@ -70,6 +70,7 @@ OnContent="{DynamicResource enable}" /> + + - +