update in issues.

Author: yanjinhuagood

SoftwareHelper/Helpers/Win32Api.cs

@@ -241,8 +241,7 @@ public static void RegisterDesktop(EmbedDeasktopView window = null)
             var dpiX = source.CompositionTarget.TransformToDevice.M11; 
             var dpiY = source.CompositionTarget.TransformToDevice.M22;
 
-            if (_window.ActualWidth < 90)
-                _window.Width = 90;
+            _window.Width = 90;
             _window.Width = _window.ActualWidth * dpiX;
             _window.Height = _window.ActualHeight * dpiY;
 

SoftwareHelper/Views/EmbedDeasktopView.xaml.cs

@@ -11,6 +11,7 @@
 using System.Windows.Media.Animation;
 using SoftwareHelper.Helpers;
 using SoftwareHelper.ViewModels;
+using WPFDevelopers.Controls;
 
 namespace SoftwareHelper.Views
 {
@@ -19,12 +20,12 @@ namespace SoftwareHelper.Views
     /// </summary>
     public partial class EmbedDeasktopView : Window
     {
-        private bool inDrag;
-        private readonly Rect desktopWorkingArea;
-        private Point anchorPoint;
         private readonly KeyboardHook _hook;
+        private readonly Rect desktopWorkingArea;
         private readonly List<Key> keys = new List<Key>();
-        private MainVM mainVM;
+        private Point anchorPoint;
+        private bool inDrag;
+        private readonly MainVM mainVM;
 
         public EmbedDeasktopView()
         {
@@ -51,7 +52,7 @@ private void OnHookKeyDown(object sender, HookEventArgs e)
             SetKeyDown(e.Key);
             if (IsKeyDown(Key.PrintScreen))
             {
-                var screenCut = new WPFDevelopers.Controls.ScreenCut();
+                var screenCut = new ScreenCut();
                 screenCut.ShowDialog();
             }
             else
@@ -152,7 +153,33 @@ private void MenuItem_Click(object sender, RoutedEventArgs e)
             myNotifyIcon.Dispose();
             Environment.Exit(0);
         }
+
+        public void ExitEmbedded()
+        {
+            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;
+        }
+
+        private void myNotifyIcon_TrayLeftMouseUp(object sender, RoutedEventArgs e)
+        {
+            if (mainVM.IsEmbedded) return;
+            Show();
+            Activate();
+            Focus();
+        }
+
         #region 移动窗体
+
         protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         {
             anchorPoint = e.GetPosition(this);
@@ -165,16 +192,9 @@ protected override void OnMouseMove(MouseEventArgs e)
         {
             try
             {
-                if (!inDrag) return;
+                if (!inDrag && e.LeftButton != MouseButtonState.Pressed) return;
                 var currentPoint = e.GetPosition(this);
-                var y = this.Top + currentPoint.Y - anchorPoint.Y;
-                Win32Api.RECT rect;
-                Win32Api.GetWindowRect(new WindowInteropHelper(this).Handle, out rect);
-                var w = rect.right - rect.left;
-                var h = rect.bottom - rect.top;
-                int x = Convert.ToInt32(PrimaryScreen.DESKTOP.Width - w);
-                Win32Api.MoveWindow(new WindowInteropHelper(this).Handle, x, (int)y, w, h, 1);
-
+                Top = Top + (currentPoint.Y - anchorPoint.Y);
             }
             catch (Exception ex)
             {
@@ -191,31 +211,18 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
                 e.Handled = true;
             }
         }
+
         #endregion
-        public void ExitEmbedded()
-        {
-            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)
         {
-
             try
             {
-                EasingFunctionBase easeFunction = new CubicEase()
+                EasingFunctionBase easeFunction = new CubicEase
                 {
-                    EasingMode = EasingMode.EaseOut,
+                    EasingMode = EasingMode.EaseOut
                 };
 
                 var heightAnimation = new DoubleAnimation
@@ -224,23 +231,20 @@ private void ToggleButtonMini_Checked(object sender, RoutedEventArgs e)
                     From = desktopWorkingArea.Height / 2,
                     To = 60,
                     Duration = new Duration(TimeSpan.FromSeconds(0.5)),
-                    EasingFunction = easeFunction,
-                };
-                heightAnimation.Completed += delegate
-                {
-                    BeginAnimation(HeightProperty, null);
+                    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
                 {
-                    Left = desktopWorkingArea.Width - this.Width;
+                    Left = desktopWorkingArea.Width - Width;
                     BeginAnimation(WidthProperty, null);
                 };
                 BeginAnimation(HeightProperty, heightAnimation);
@@ -253,26 +257,24 @@ private void ToggleButtonMini_Checked(object sender, RoutedEventArgs e)
         }
 
 
-
         private void UnToggleButtonMini_Checked(object sender, RoutedEventArgs e)
         {
-
             try
             {
-                var easeFunction = new CubicEase()
+                var easeFunction = new CubicEase
                 {
-                    EasingMode = EasingMode.EaseIn,
+                    EasingMode = EasingMode.EaseIn
                 };
                 var widthAnimation = new DoubleAnimation
                 {
                     From = 30,
                     To = 120,
                     Duration = new Duration(TimeSpan.FromSeconds(0.01)),
-                    EasingFunction = easeFunction,
+                    EasingFunction = easeFunction
                 };
                 widthAnimation.Completed += delegate
                 {
-                    Left = desktopWorkingArea.Width - this.Width;
+                    Left = desktopWorkingArea.Width - Width;
                     BeginAnimation(WidthProperty, null);
                 };
 
@@ -281,31 +283,18 @@ private void UnToggleButtonMini_Checked(object sender, RoutedEventArgs e)
                     From = 60,
                     To = desktopWorkingArea.Height / 2,
                     Duration = new Duration(TimeSpan.FromSeconds(0.5)),
-                    EasingFunction = easeFunction,
-                };
-                heightAnimation.Completed += delegate
-                {
-                    BeginAnimation(HeightProperty, null);
+                    EasingFunction = easeFunction
                 };
+                heightAnimation.Completed += delegate { BeginAnimation(HeightProperty, null); };
                 BeginAnimation(WidthProperty, widthAnimation);
                 BeginAnimation(HeightProperty, heightAnimation);
             }
             catch (Exception ex)
             {
                 Log.Error($"MainView.UnToggleButtonMini_Checked{ex.Message}");
             }
-
         }
 
-
         #endregion
-
-        private void myNotifyIcon_TrayLeftMouseUp(object sender, RoutedEventArgs e)
-        {
-            if (mainVM.IsEmbedded) return;
-            Show();
-            Activate();
-            Focus();
-        }
     }
 }

SoftwareHelper/Views/StartView.xaml

@@ -28,9 +28,9 @@
         <Rectangle x:Name="freeRect" Fill="{StaticResource freeMachineImageBrush}" 
                    Height="48" Width="128" Canvas.Left="186" Canvas.Top="20"/>
         <TextBlock x:Name="tbMsg" FontSize="20" Canvas.Left="10" />
-        <TextBlock x:Name="tb1" Text="8866" FontSize="20" Canvas.Left="200" Canvas.Top="120" Width="1262"/>
+        <TextBlock x:Name="tb1" Text="8866                                   微信公众号：WPF开发者" FontSize="20" Canvas.Left="100" Canvas.Top="120" Width="1262"/>
         <TextBlock x:Name="tb2" Text="2333哈哈哈哈" FontSize="20" Canvas.Left="800" Canvas.Top="80" Width="1262"/>
-        <TextBlock x:Name="tb3" Text="66666                                                                 再接再厉" FontSize="20" Canvas.Left="450" Canvas.Top="160" Width="1262"/>
+        <TextBlock x:Name="tb3" Text="66666                                                        再接再厉" FontSize="20" Canvas.Left="450" Canvas.Top="160" Width="1262"/>
         <!-- Canvas.Left="122"-->
     </Canvas>
 </Window>

SoftwareHelper/Views/StartView.xaml.cs

@@ -33,12 +33,12 @@ public StartView()
             background2.Fill = backgroundBrush;
             if (background2.Fill.CanFreeze)
                 background2.Fill.Freeze();
-            Start();
             Loaded += StartView_Loaded;
         }
 
         private void StartView_Loaded(object sender, RoutedEventArgs e)
         {
+            Start();
             var bw = new BackgroundWorker();
             bw.DoWork += delegate
             {