From 27daffe515319317682afb263e532fdd11e221b2 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 14 Jun 2025 23:26:08 +0900
Subject: [PATCH] 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 @@
     <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">Keep on top</system:String>
-    <system:String x:Key="showAtTopmostToolTip">Keeps the search window on top even after it loses focus.</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>
 
     <!--  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 ae1648076..e8ae0dc3c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -17,7 +17,6 @@
     mc:Ignorable="d">
     <ui:Page.Resources>
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
     </ui:Page.Resources>
     <ScrollViewer
         Margin="0"
@@ -64,23 +63,12 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:ExCard Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
-                <cc:ExCard.SideContent>
-                    <ui:ToggleSwitch
+            <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
+                <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideWhenDeactivated}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
-                </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>
 
             <cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
                 <ui:ToggleSwitch
@@ -89,6 +77,16 @@
                     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;">