Fix a weird bug

HMBSbige · Oct 7, 2019 · 565bbba · 565bbba
1 parent 86ab767
commit 565bbba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/shadowsocks-csharp/Controller/HttpRequest/UpdateChecker.cs b/shadowsocks-csharp/Controller/HttpRequest/UpdateChecker.cs
@@ -25,7 +25,7 @@ public class UpdateChecker
 
         public const string Name = @"ShadowsocksR";
         public const string Copyright = @"Copyright © HMBSbige 2019 & BreakWa11 2017. Fork from Shadowsocks by clowwindy";
-        public const string Version = @"5.1.3.1";
+        public const string Version = @"5.1.3.2";
 
         public const string FullVersion = Version +
 #if IsDotNetCore

diff --git a/shadowsocks-csharp/View/ConfigWindow.xaml b/shadowsocks-csharp/View/ConfigWindow.xaml
@@ -8,7 +8,9 @@
         mc:Ignorable="d"
         x:Name="Cw" 
         Title="ConfigWindow" Height="560" Width="800" WindowStartupLocation="CenterScreen"
-        Loaded="Window_Loaded">
+        Loaded="Window_Loaded"
+        Activated="ConfigWindow_OnActivated"
+        >
 
     <Window.Resources>
         <ResourceDictionary>

diff --git a/shadowsocks-csharp/View/ConfigWindow.xaml.cs b/shadowsocks-csharp/View/ConfigWindow.xaml.cs
@@ -555,5 +555,10 @@ private void ShowQrCodeButton_OnClick(object sender, RoutedEventArgs e)
         }
 
         #endregion
+
+        private void ConfigWindow_OnActivated(object sender, EventArgs e)
+        {
+            Topmost = false;
+        }
     }
 }
diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs
@@ -817,6 +817,7 @@ private void ShowConfigForm(int index)
                 {
                     _configWindow.WindowState = WindowState.Normal;
                 }
+                _configWindow.Topmost = true;
                 _configWindow.MoveToSelectedItem(index);
             }
             else
@@ -825,7 +826,7 @@ private void ShowConfigForm(int index)
                 _configWindow = new ConfigWindow(controller, index);
                 _configWindow.Show();
                 _configWindow.Activate();
-                _configWindow.BringToFront();
+                _configWindow.Topmost = true;
                 _configWindow.Closed += ConfigWindow_Closed;
             }
         }