From 5c76a1df83714429dfccca5bbc37d1c031822ac4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-3BO4HSG\\ksat" <zggsong@foxmail.com>
Date: Tue, 10 Jan 2023 10:33:58 +0800
Subject: [PATCH] chore: remove topmost view int viewmodel

---
 STranslate/View/MainWindow.xaml |  4 +++-
 STranslate/ViewModel/MainVM.cs  | 16 +++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/STranslate/View/MainWindow.xaml b/STranslate/View/MainWindow.xaml
index e067d01..6f678bd 100644
--- a/STranslate/View/MainWindow.xaml
+++ b/STranslate/View/MainWindow.xaml
@@ -46,7 +46,8 @@
                     Key="T"
                     Command="{Binding TopmostCmd}"/>
         <KeyBinding Key="Esc"
-                    Command="{Binding EscCmd}"/>
+                    Command="{Binding EscCmd}"
+                    CommandParameter="{Binding ElementName=TopmostBtn, Mode=OneWay}"/>
     </Window.InputBindings>
 
 
@@ -80,6 +81,7 @@
             <Grid x:Name="Header">
                 <Button x:Name="TopmostBtn"
                         Command="{Binding TopmostCmd}"
+                        CommandParameter="{Binding Mode=OneWay, RelativeSource={RelativeSource Self}}"
                         Template="{DynamicResource ButtonTemplateUnTopmost}"/>
                 <Button Width="auto"
                         Template="{DynamicResource ButtonTemplateTheme}"
diff --git a/STranslate/ViewModel/MainVM.cs b/STranslate/ViewModel/MainVM.cs
index 40caf95..0bca180 100644
--- a/STranslate/ViewModel/MainVM.cs
+++ b/STranslate/ViewModel/MainVM.cs
@@ -61,33 +61,31 @@ namespace STranslate.ViewModel
             });
 
             //置顶
-            TopmostCmd = new RelayCommand((_) => true, (_) =>
+            TopmostCmd = new RelayCommand((_) => true, (o) =>
             {
+                var button = o as System.Windows.Controls.Button;
                 if (IsTopmost)
                 {
-                    (Mainwin.FindName("TopmostBtn") as System.Windows.Controls.Button)
-                    .SetResourceReference(System.Windows.Controls.Control.TemplateProperty, _UnTopmostTemplateName);
+                    button.SetResourceReference(System.Windows.Controls.Control.TemplateProperty, _UnTopmostTemplateName);
                 }
                 else
                 {
-                    (Mainwin.FindName("TopmostBtn") as System.Windows.Controls.Button)
-                    .SetResourceReference(System.Windows.Controls.Control.TemplateProperty, _TopmostTemplateName);
+                    button.SetResourceReference(System.Windows.Controls.Control.TemplateProperty, _TopmostTemplateName);
                 }
                 IsTopmost = !IsTopmost;
             });
 
             //ESC
-            EscCmd = new RelayCommand((_) => true, (_) =>
+            EscCmd = new RelayCommand((_) => true, (o) =>
             {
-                Mainwin.Hide();
-
                 //取消置顶
                 if (IsTopmost)
                 {
-                    (Mainwin.FindName("TopmostBtn") as System.Windows.Controls.Button)
+                    (o as System.Windows.Controls.Button)
                     .SetResourceReference(System.Windows.Controls.Control.TemplateProperty, _UnTopmostTemplateName);
                     IsTopmost = !IsTopmost;
                 }
+                Mainwin.Hide();
             });
 
             //切换语言