From 15266f25853409609ea237d2af3f5ec4131d68bd Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 14 Nov 2021 09:13:56 +0900
Subject: [PATCH] - Add time for hide when open setting (using context menu) -
 Adjust String

---
 Flow.Launcher/Languages/en.xaml  | 51 +++++++++++++++++---------------
 Flow.Launcher/MainWindow.xaml.cs | 10 ++++---
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 9721ad869..416773c54 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <!--MainWindow-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
     <system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
@@ -15,7 +16,7 @@
     <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
 
-    <!--Setting General-->
+    <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
@@ -44,7 +45,7 @@
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
-    <!--Setting Plugin-->
+    <!--  Setting Plugin  -->
     <system:String x:Key="plugin">Plugins</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="enable">On</system:String>
@@ -62,12 +63,12 @@
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 
 
-    <!--Setting Plugin Store-->
+    <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>
     <system:String x:Key="refresh">Refresh</system:String>
     <system:String x:Key="install">Install</system:String>
 
-    <!--Setting Theme-->
+    <!--  Setting Theme  -->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
     <system:String x:Key="howToCreateTheme">How to create a theme</system:String>
@@ -81,11 +82,11 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="SoundEffect">Sound Effect</system:String>
-    <system:String x:Key="SoundEffectTip">Play a small sound when window open.</system:String>
+    <system:String x:Key="SoundEffectTip">Play a small sound when window open</system:String>
     <system:String x:Key="Animation">Animation</system:String>
-    <system:String x:Key="AnimationTip">Use Animation in UI.</system:String>
+    <system:String x:Key="AnimationTip">Use Animation in UI</system:String>
 
-    <!--Setting Hotkey-->
+    <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
@@ -106,7 +107,7 @@
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 
-    <!--Setting Proxy-->
+    <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
     <system:String x:Key="enableProxy">Enable HTTP Proxy</system:String>
     <system:String x:Key="server">HTTP Server</system:String>
@@ -122,7 +123,7 @@
     <system:String x:Key="proxyIsCorrect">Proxy configured correctly</system:String>
     <system:String x:Key="proxyConnectFailed">Proxy connection failed</system:String>
 
-    <!--Setting About-->
+    <!--  Setting About  -->
     <system:String x:Key="about">About</system:String>
     <system:String x:Key="website">Website</system:String>
     <system:String x:Key="version">Version</system:String>
@@ -131,18 +132,18 @@
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
-        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
+        Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com,
         or go to https://github.com/Flow-Launcher/Flow.Launcher/releases to download updates manually.
     </system:String>
     <system:String x:Key="releaseNotes">Release Notes</system:String>
     <system:String x:Key="documentation">Usage Tips:</system:String>
 
-    <!--Priority Setting Dialog-->
+    <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Change Priority</system:String>
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
 
-    <!--Action Keyword Setting Dialog-->
+    <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
     <system:String x:Key="newActionKeywords">New Action Keyword</system:String>
     <system:String x:Key="cancel">Cancel</system:String>
@@ -152,9 +153,9 @@
     <system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
     <system:String x:Key="success">Success</system:String>
     <system:String x:Key="completedSuccessfully">Completed successfully</system:String>
-    <system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. </system:String>
+    <system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords.</system:String>
 
-    <!--Custom Query Hotkey Dialog-->
+    <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
     <system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
     <system:String x:Key="preview">Preview</system:String>
@@ -162,10 +163,10 @@
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
     <system:String x:Key="update">Update</system:String>
 
-    <!--Hotkey Control-->
+    <!--  Hotkey Control  -->
     <system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
 
-    <!--Crash Reporter-->
+    <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Time</system:String>
     <system:String x:Key="reportWindow_reproduce">Please tell us how application crashed so we can fix it</system:String>
@@ -181,16 +182,18 @@
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
 
-    <!--General Notice-->
+    <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
 
-    <!--update-->
+    <!--  update  -->
     <system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
     <system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
     <system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
     <system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
-    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher was not able to move your user profile data to the new update version.
-        Please manually move your profile data folder from {0} to {1}</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
+        Flow Launcher was not able to move your user profile data to the new update version.
+        Please manually move your profile data folder from {0} to {1}
+    </system:String>
     <system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
     <system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 2d8e2f822..bae41788c 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -250,7 +250,7 @@ namespace Flow.Launcher
                 {
                     From = 0,
                     To = 1,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
 
@@ -258,7 +258,7 @@ namespace Flow.Launcher
                 {
                     From = Top + 8,
                     To = Top,
-                    Duration = TimeSpan.FromSeconds(0.2),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
 
@@ -266,7 +266,7 @@ namespace Flow.Launcher
                 {
                     From = Left,
                     To = Left,
-                    Duration = TimeSpan.FromSeconds(0.1),
+                    Duration = TimeSpan.FromSeconds(0.18),
                     FillBehavior = FillBehavior.Stop
                 };
                 Storyboard.SetTarget(da, this);
@@ -314,8 +314,10 @@ namespace Flow.Launcher
             e.Handled = true;
         }
 
-        private void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
+        private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
+            _viewModel.Hide();
+            await Task.Delay(100);
             App.API.OpenSettingDialog();
         }