fix popup empty when same key press, add reset pop msg when lost focus

Author: jjw24

Flow.Launcher/HotkeyControl.xaml

@@ -50,6 +50,7 @@
             VerticalContentAlignment="Center"
             input:InputMethod.IsInputMethodEnabled="False"
             PreviewKeyDown="TbHotkey_OnPreviewKeyDown"
-            TabIndex="100" />
+            TabIndex="100"
+            LostFocus="tbHotkey_LostFocus"/>
     </Grid>
 </UserControl>

Flow.Launcher/HotkeyControl.xaml.cs

@@ -14,6 +14,10 @@ namespace Flow.Launcher
 {
     public partial class HotkeyControl : UserControl
     {
+        private Brush tbMsgForegroundColorOriginal;
+
+        private string tbMsgTextOriginal;
+
         public HotkeyModel CurrentHotkey { get; private set; }
         public bool CurrentHotkeyAvailable { get; private set; }
 
@@ -24,6 +28,8 @@ public partial class HotkeyControl : UserControl
         public HotkeyControl()
         {
             InitializeComponent();
+            tbMsgTextOriginal = tbMsg.Text;
+            tbMsgForegroundColorOriginal = tbMsg.Foreground;
         }
 
         private CancellationTokenSource hotkeyUpdateSource;
@@ -35,7 +41,6 @@ private void TbHotkey_OnPreviewKeyDown(object sender, KeyEventArgs e)
             hotkeyUpdateSource = new();
             var token = hotkeyUpdateSource.Token;
             e.Handled = true;
-            tbMsg.Visibility = Visibility.Hidden;
 
             //when alt is pressed, the real key should be e.SystemKey
             Key key = e.Key == Key.System ? e.SystemKey : e.Key;
@@ -104,5 +109,11 @@ public void SetHotkey(string keyStr, bool triggerValidate = true)
         private bool CheckHotkeyAvailability() => HotKeyMapper.CheckAvailability(CurrentHotkey);
 
         public new bool IsFocused => tbHotkey.IsFocused;
+
+        private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
+        {
+            tbMsg.Text = tbMsgTextOriginal;
+            tbMsg.Foreground = tbMsgForegroundColorOriginal;
+        }
     }
 }

Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs

@@ -3,6 +3,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using System;
 using System.Windows;
+using System.Windows.Media;
 using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
@@ -11,13 +12,20 @@ public partial class WelcomePage2
     {
         private Settings Settings { get; set; }
 
+        private Brush tbMsgForegroundColorOriginal;
+
+        private string tbMsgTextOriginal;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             if (e.ExtraData is Settings settings)
                 Settings = settings;
             else
                 throw new ArgumentException("Unexpected Parameter setting.");
+            
             InitializeComponent();
+            tbMsgTextOriginal = HotkeyControl.tbMsg.Text;
+            tbMsgForegroundColorOriginal = HotkeyControl.tbMsg.Foreground;
 
             HotkeyControl.SetHotkey(new Infrastructure.Hotkey.HotkeyModel(Settings.Hotkey), false);
         }
@@ -36,6 +44,9 @@ private void HotkeyControl_OnLostFocus(object sender, RoutedEventArgs args)
             {
                 HotKeyMapper.SetHotkey(new HotkeyModel(Settings.Hotkey), HotKeyMapper.OnToggleHotkey);
             }
+
+            HotkeyControl.tbMsg.Text = tbMsgTextOriginal;
+            HotkeyControl.tbMsg.Foreground = tbMsgForegroundColorOriginal;
         }
     }
 }