update in issues.

Author: yanjinhuagood

SoftwareHelper/Helpers/Win32Api.cs

@@ -7,6 +7,7 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
 namespace SoftwareHelper.Helpers
@@ -239,6 +240,9 @@ public static void RegisterDesktop(EmbedDeasktopView window = null)
             var source = PresentationSource.FromVisual(_window);
             var dpiX = source.CompositionTarget.TransformToDevice.M11; 
             var dpiY = source.CompositionTarget.TransformToDevice.M22;
+
+            if (_window.ActualWidth < 90)
+                _window.Width = 90;
             _window.Width = _window.ActualWidth * dpiX;
             _window.Height = _window.ActualHeight * dpiY;
 

SoftwareHelper/Views/EmbedDeasktopView.xaml.cs

@@ -24,10 +24,12 @@ public partial class EmbedDeasktopView : Window
         private Point anchorPoint;
         private readonly KeyboardHook _hook;
         private readonly List<Key> keys = new List<Key>();
+        private MainVM mainVM;
 
         public EmbedDeasktopView()
         {
             InitializeComponent();
+            mainVM = DataContext as MainVM;
             desktopWorkingArea = SystemParameters.WorkArea;
             Loaded += EmbedDeasktopView_Loaded;
             Closing += EmbedDeasktopView_Closing;
@@ -38,13 +40,14 @@ public EmbedDeasktopView()
 
         private void OnHookKeyUp(object sender, HookEventArgs e)
         {
+            if (!mainVM.IsEmbedded) return;
             SetKeyUp(e.Key);
-            Thread.Sleep(300);
             KeyDownPanel.Visibility = Visibility.Collapsed;
         }
 
         private void OnHookKeyDown(object sender, HookEventArgs e)
         {
+            if (!mainVM.IsEmbedded) return;
             SetKeyDown(e.Key);
             if (IsKeyDown(Key.PrintScreen))
             {
@@ -191,11 +194,19 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
         #endregion
         public void ExitEmbedded()
         {
-            Width = 110;
+            if(ToggleButtonMini.IsChecked == true)
+                Width = 30;
+            else
+                Width = 120;
             Height = desktopWorkingArea.Height / 2;
             Left = desktopWorkingArea.Width - Width;
             Top = desktopWorkingArea.Height / 2 - (Height / 2);
         }
+        public void OepnEmbedded()
+        {
+            if (mainVM.IsEmbedded) return;
+
+        }
         #region 窗体动画
         private void ToggleButtonMini_Checked(object sender, RoutedEventArgs e)
         {
@@ -210,24 +221,30 @@ private void ToggleButtonMini_Checked(object sender, RoutedEventArgs e)
                 var heightAnimation = new DoubleAnimation
                 {
                     Name = "heightMini",
+                    From = desktopWorkingArea.Height / 2,
                     To = 60,
                     Duration = new Duration(TimeSpan.FromSeconds(0.5)),
-                    EasingFunction = easeFunction
+                    EasingFunction = easeFunction,
+                };
+                heightAnimation.Completed += delegate
+                {
+                    BeginAnimation(HeightProperty, null);
                 };
                 var widthAnimation = new DoubleAnimation
                 {
                     Name = "widthMini",
+                    From = 120,
                     To = 30,
                     Duration = new Duration(TimeSpan.FromSeconds(0.51)),
-                    EasingFunction = easeFunction
+                    EasingFunction = easeFunction,
                 };
                 widthAnimation.Completed += delegate
                 {
-                    this.Left = desktopWorkingArea.Width - this.Width;
+                    Left = desktopWorkingArea.Width - this.Width;
+                    BeginAnimation(WidthProperty, null);
                 };
-               
-                this.BeginAnimation(HeightProperty, heightAnimation);
-                this.BeginAnimation(WidthProperty, widthAnimation);
+                BeginAnimation(HeightProperty, heightAnimation);
+                BeginAnimation(WidthProperty, widthAnimation);
             }
             catch (Exception ex)
             {
@@ -248,23 +265,30 @@ private void UnToggleButtonMini_Checked(object sender, RoutedEventArgs e)
                 };
                 var widthAnimation = new DoubleAnimation
                 {
+                    From = 30,
                     To = 120,
                     Duration = new Duration(TimeSpan.FromSeconds(0.01)),
-                    EasingFunction = easeFunction
+                    EasingFunction = easeFunction,
                 };
                 widthAnimation.Completed += delegate
                 {
-                    this.Left = desktopWorkingArea.Width - this.Width;
+                    Left = desktopWorkingArea.Width - this.Width;
+                    BeginAnimation(WidthProperty, null);
                 };
 
                 var heightAnimation = new DoubleAnimation
                 {
+                    From = 60,
                     To = desktopWorkingArea.Height / 2,
                     Duration = new Duration(TimeSpan.FromSeconds(0.5)),
-                    EasingFunction = easeFunction
+                    EasingFunction = easeFunction,
+                };
+                heightAnimation.Completed += delegate
+                {
+                    BeginAnimation(HeightProperty, null);
                 };
-                this.BeginAnimation(WidthProperty, widthAnimation);
-                this.BeginAnimation(HeightProperty, heightAnimation);
+                BeginAnimation(WidthProperty, widthAnimation);
+                BeginAnimation(HeightProperty, heightAnimation);
             }
             catch (Exception ex)
             {
@@ -278,8 +302,7 @@ private void UnToggleButtonMini_Checked(object sender, RoutedEventArgs e)
 
         private void myNotifyIcon_TrayLeftMouseUp(object sender, RoutedEventArgs e)
         {
-            var vm = DataContext as MainVM;
-            if (vm == null && vm.IsEmbedded) return;
+            if (mainVM.IsEmbedded) return;
             Show();
             Activate();
             Focus();