From a64bed34feaa50d05492d28ffacec8f56d35d3cb Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Oct 2025 19:45:06 +0800
Subject: [PATCH] Resolve conflicts in SettingsPaneHotkey.xaml.cs

---
 .../Views/SettingsPaneHotkey.xaml.cs           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
index f3b4564da..efcda95e0 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -10,6 +10,7 @@ using Flow.Launcher.Plugin;
 using Flow.Launcher.Resources.Controls;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
+using iNKORE.UI.WPF.Modern.Controls;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -50,9 +51,9 @@ public partial class SettingsPaneHotkey
             var allHotkeyInvisible = hotkeyInfo.All(h => !h.Visible);
             if (allHotkeyInvisible) continue;
 
-            var excard = new ExCard()
+            var excard = new SettingsExpander()
             {
-                Title = metadata.Name,
+                Header = metadata.Name,
                 Margin = new Thickness(0, 4, 0, 0),
             };
             var hotkeyStackPanel = new StackPanel
@@ -66,12 +67,11 @@ public partial class SettingsPaneHotkey
                 // Skip invisible hotkeys
                 if (!hotkey.Visible) continue;
 
-                var card = new Card()
+                var card = new SettingsCard()
                 {
-                    Title = hotkey.Name,
-                    Sub = hotkey.Description,
-                    Icon = hotkey.Glyph.Glyph,
-                    Type = Card.CardType.Inside
+                    Header = hotkey.Name,
+                    Description = hotkey.Description,
+                    HeaderIcon = new FontIcon() { Glyph = hotkey.Glyph.Glyph }
                 };
                 var hotkeySetting = metadata.PluginHotkeys.Find(h => h.Id == hotkey.Id)?.Hotkey ?? hotkey.DefaultHotkey;
                 if (hotkey.Editable)
@@ -83,9 +83,9 @@ public partial class SettingsPaneHotkey
                             HotkeyControl.HotkeyType.WindowPluginHotkey,
                         DefaultHotkey = hotkey.DefaultHotkey,
                         ValidateKeyGesture = false,
-                        Hotkey = hotkeySetting
+                        Hotkey = hotkeySetting,
+                        ChangeHotkey = new RelayCommand<HotkeyModel>((h) => ChangePluginHotkey(metadata, hotkey, h))
                     };
-                    hotkeyControl.ChangeHotkey = new RelayCommand<HotkeyModel>((h) => ChangePluginHotkey(metadata, hotkey, h));
                     card.Content = hotkeyControl;
                 }
                 else