From 603d0f45ca6994fdc1b32bb3d2898e2ea14f4b87 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 19 Apr 2024 01:11:29 +0900
Subject: [PATCH] Add FitType for card control

---
 Flow.Launcher/Languages/en.xaml            | 2 +-
 Flow.Launcher/Resources/Controls/Card.xaml | 8 +++++++-
 Flow.Launcher/SettingWindow.xaml           | 9 +++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d04f834ea..f988c364d 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -199,7 +199,7 @@
     <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width Size</system:String>
     <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height Size</system:String>
     <system:String x:Key="ReloadPluginHotkeyToolTip">Use it when the plugin settings you changed don't take effect.</system:String>
-    <system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function. It's complimentary</system:String>
+    <system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>
     <system:String x:Key="customQueryShortcut">Custom Query Shortcuts</system:String>
     <system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
diff --git a/Flow.Launcher/Resources/Controls/Card.xaml b/Flow.Launcher/Resources/Controls/Card.xaml
index 4b43bf06c..83449feb0 100644
--- a/Flow.Launcher/Resources/Controls/Card.xaml
+++ b/Flow.Launcher/Resources/Controls/Card.xaml
@@ -29,6 +29,13 @@
                                 <Setter Property="Margin" Value="0,0,0,0" />
                                 <Setter Property="Background" Value="Transparent" />
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="InsideFit">
+                                <Setter Property="BorderThickness" Value="0,1,0,0" />
+                                <Setter Property="CornerRadius" Value="0" />
+                                <Setter Property="Margin" Value="0,0,0,0" />
+                                <Setter Property="Padding" Value="38,0,26,0" />
+                                <Setter Property="Background" Value="Transparent" />
+                            </DataTrigger>
                         </Style.Triggers>
                     </Style>
                 </Border.Style>
@@ -48,7 +55,6 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Content="{TemplateBinding Content}" />
-
                     <StackPanel>
                         <StackPanel.Style>
                             <Style TargetType="{x:Type StackPanel}">
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index fa05bf7f8..6c4c8c621 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2841,9 +2841,8 @@
                                         </cc:ExCard.SideContent>
                                         <cc:Card
                                             Title="{DynamicResource autoCompleteHotkey}"
-                                            Icon="&#xe710;"
                                             Sub="{DynamicResource AdditionalHotkeyToolTip}"
-                                            Type="Inside">
+                                            Type="InsideFit">
                                             <flowlauncher:HotkeyControl
                                                 DefaultHotkey=""
                                                 Hotkey="{Binding Settings.AutoCompleteHotkey2}"
@@ -2864,9 +2863,8 @@
                                         </cc:ExCard.SideContent>
                                         <cc:Card
                                             Title="{DynamicResource SelectNextItemHotkey}"
-                                            Icon="&#xe710;"
                                             Sub="{DynamicResource AdditionalHotkeyToolTip}"
-                                            Type="Inside">
+                                            Type="InsideFit">
                                             <flowlauncher:HotkeyControl
                                                 DefaultHotkey=""
                                                 Hotkey="{Binding Settings.SelectNextItemHotkey2}"
@@ -2886,9 +2884,8 @@
                                         </cc:ExCard.SideContent>
                                         <cc:Card
                                             Title="{DynamicResource SelectPrevItemHotkey}"
-                                            Icon="&#xe710;"
                                             Sub="{DynamicResource AdditionalHotkeyToolTip}"
-                                            Type="Inside">
+                                            Type="InsideFit">
                                             <flowlauncher:HotkeyControl
                                                 DefaultHotkey=""
                                                 Hotkey="{Binding Settings.SelectPrevItemHotkey2}"