From f30c6fc577c9fd60ee2de0db6f275847c2ff8f4c Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 14 Jun 2025 22:19:31 +0900
Subject: [PATCH] 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 @@
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
-    <system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
-    <system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
+    <system:String x:Key="showAtTopmost">Keep on top</system:String>
+    <system:String x:Key="showAtTopmostToolTip">Keeps the search window on top even after it loses focus.</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
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">
     <ui:Page.Resources>
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
     </ui:Page.Resources>
     <ScrollViewer
         Margin="0"
@@ -63,12 +64,23 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
-                <ui:ToggleSwitch
+            <cc:ExCard Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
+                <cc:ExCard.SideContent>
+                    <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideWhenDeactivated}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
-            </cc:Card>
+                </cc:ExCard.SideContent>
+                <cc:Card
+                Title="{DynamicResource showAtTopmost}"
+                Type="InsideFit"
+                Sub="{DynamicResource showAtTopmostToolTip}">
+                    <ui:ToggleSwitch
+                    IsOn="{Binding Settings.ShowAtTopmost}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}"   IsEnabled="{Binding Settings.HideWhenDeactivated, Converter={StaticResource BoolNegationConverter}}"/>
+                </cc:Card>
+            </cc:ExCard>
 
             <cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
                 <ui:ToggleSwitch
@@ -77,16 +89,6 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card
-                Title="{DynamicResource showAtTopmost}"
-                Margin="0 14 0 0"
-                Icon="&#xE923;"
-                Sub="{DynamicResource showAtTopmostToolTip}">
-                <ui:ToggleSwitch
-                    IsOn="{Binding Settings.ShowAtTopmost}"
-                    OffContent="{DynamicResource disable}"
-                    OnContent="{DynamicResource enable}" />
-            </cc:Card>
 
             <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">