zhao：1 增肌获取缩放后工作区域2修改截图最小宽高为50 超出禁止拖动

Common/system/PrimaryScreen.cs

@@ -142,9 +142,23 @@ namespace Common.system
         /// 缩放后的大小
         /// </summary>
         /// <returns></returns>
-        public static SizeF ScaleScreenSize()
+        public static SizeF ScaleScreenSize
         {
-            return new SizeF(((float)DESKTOP.Width) / (DpiX / 96f), ((float)DESKTOP.Height) / (DpiY / 96f));
+            get
+            {
+               return new SizeF(((float)DESKTOP.Width) / (DpiX / 96f), ((float)DESKTOP.Height) / (DpiY / 96f));
+            }
+        }
+        /// <summary>
+        /// 获取缩放后的工作区域大小
+        /// </summary>
+        public static RectangleF ScaleWorkingAreaSize
+        {
+            get
+            {
+                RectangleF rect = System.Windows.Forms.Screen.GetWorkingArea(new System.Drawing.Point((int)ScaleScreenSize.Width, (int)ScaleScreenSize.Height));
+                return new RectangleF(((float)rect.X) / (DpiX / 96f), ((float)rect.Y) / (DpiX / 96f), ((float)rect.Width) / (DpiX / 96f), ((float)rect.Height) / (DpiY / 96f));
+            }
         }
         #endregion
     }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -9,7 +9,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1036" Width="1276" 
-    WindowStyle="None"    AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+    WindowStyle="None"    AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7" WindowStartupLocation="Manual" Margin="0,300,0,0">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -255,7 +255,7 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
-            </Grid>
+                </Grid>
             <!--主内容-->
             <Grid Grid.Row="1" x:Name="GridMain" Width="1276" Visibility="Visible">
                 <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -27,6 +27,7 @@ using System.Windows.Threading;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows.Controls.Primitives;
+using System.Linq;
 
 namespace XHWK.WKTool
 {
@@ -3371,11 +3372,29 @@ namespace XHWK.WKTool
             ShowAngleBorder();
         }
         System.Drawing.PointF imgRightDown;
+        /// <summary>
+        /// 设置控件最上层
+        /// </summary>
+        /// <param name="element"></param>
+        public void BringToFront(Thumb element)//图片置于最顶层显示
+        {
+            if (element == null) return;
+            
+            Canvas parent = element.Parent as Canvas;
+            if (parent == null) return;
+            var maxZ = parent.Children.OfType<UIElement>()//linq语句，取Zindex的最大值
+              .Where(x => x != element)
+              .Select(x => Canvas.GetZIndex(x))
+              .Max();
+            Canvas.SetZIndex(element, maxZ + 1);
+        }
         private void RectRightUp_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
         {
             try
             {
                 Thumb thu = (Thumb)sender;
+                BringToFront(thu);
+
                 imgRightDown = new System.Drawing.PointF((float)(imgCanvas.Margin.Left + imgCanvas.ActualWidth), (float)(imgCanvas.Margin.Top + imgCanvas.ActualHeight));
                 HideAngleBorder();
                 switch (thu.Name)
@@ -3411,36 +3430,152 @@ namespace XHWK.WKTool
                 double plut = Canvas.GetTop(RectLeftUp);
                 double prdl = Canvas.GetLeft(RectRightDown);
                 double prdt = Canvas.GetTop(RectRightDown);
-                if (prdl - plul > 50)
-                {
-                }
-                if (prdt - plut > 50)
-                {
-                }
                 #endregion
-                
-                    Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
-                    Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+
+                //Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                //Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                double imgW = 0;
+                double imgH = 0;
+                double imgX = 0;
+                double imgY = 0;
                 switch (thu.Name)
                 {
                     case "RectLeftUp":
-                        imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
-                        imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
-                        imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, Mouse.GetPosition(gridM).Y, 0, 0);
+                        #region 左上
+                        imgW = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        imgH = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        imgX = 0;
+                        imgY = 0;
+                        if (imgW < 50)
+                        {
+                            imgCanvas.Width = 50;
+                            imgX = imgCanvas.Margin.Left;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Width = imgW;
+                            imgX = Mouse.GetPosition(gridM).X;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                        }
+                        if (imgH < 50)
+                        {
+                            imgCanvas.Height = 50;
+                            imgY = imgCanvas.Margin.Top;
+                            Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Height = imgH;
+                            imgY = Mouse.GetPosition(gridM).Y;
+                            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                        }
+                        imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                        #endregion
+                        //imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        //imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        //imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, Mouse.GetPosition(gridM).Y, 0, 0);
                         break;
                     case "RectRightUp":
-                        imgCanvas.Width = Mouse.GetPosition(gridM).X - imgCanvas.Margin.Left;
-                        imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
-                        imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left, Mouse.GetPosition(gridM).Y, 0, 0);
+                        #region 右上
+                        imgW = Mouse.GetPosition(gridM).X - imgCanvas.Margin.Left;
+                        imgH = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        imgX = 0;
+                        imgY = 0;
+                        if (imgW < 50)
+                        {
+                            imgCanvas.Width = 50;
+                            imgX = imgCanvas.Margin.Left;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Width = imgW;
+                            imgX = imgCanvas.Margin.Left;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                        }
+                        if (imgH < 50)
+                        {
+                            imgCanvas.Height = 50;
+                            imgY = imgCanvas.Margin.Top;
+                            Canvas.SetTop(thu, Canvas.GetTop(RectRightDown) - 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Height = imgH;
+                            imgY = Mouse.GetPosition(gridM).Y;
+                            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                        }
+                        imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                        //imgCanvas.Width = Mouse.GetPosition(gridM).X - imgCanvas.Margin.Left;
+                        //imgCanvas.Height = imgRightDown.Y - (Mouse.GetPosition(gridM).Y);
+                        //imgCanvas.Margin = new Thickness(imgCanvas.Margin.Left, Mouse.GetPosition(gridM).Y, 0, 0);
+                        #endregion
                         break;
                     case "RectLeftDown":
-                        imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
-                        imgCanvas.Height = Mouse.GetPosition(gridM).Y - imgCanvas.Margin.Top;
-                        imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, imgCanvas.Margin.Top, 0, 0);
+                        #region 左下
+                        imgW = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        imgH = Mouse.GetPosition(gridM).Y - imgCanvas.Margin.Top;
+                        imgX = 0;
+                        imgY = 0;
+                        if (imgW < 50)
+                        {
+                            imgCanvas.Width = 50;
+                            imgX = imgCanvas.Margin.Left;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(RectRightDown) - 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Width = imgW;
+                            imgX = Mouse.GetPosition(gridM).X;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                        }
+                        if (imgH < 50)
+                        {
+                            imgCanvas.Height = 50;
+                            imgY = imgCanvas.Margin.Top;
+                            Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Height = imgH;
+                            imgY = imgCanvas.Margin.Top;
+                            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                        }
+                        imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                        //imgCanvas.Width = imgRightDown.X - (Mouse.GetPosition(gridM).X);
+                        //imgCanvas.Height = Mouse.GetPosition(gridM).Y - imgCanvas.Margin.Top;
+                        //imgCanvas.Margin = new Thickness(Mouse.GetPosition(gridM).X, imgCanvas.Margin.Top, 0, 0);
+                        #endregion
                         break;
                     case "RectRightDown":
-                        imgCanvas.Width += e.HorizontalChange;
-                        imgCanvas.Height += e.VerticalChange;
+                        #region 右下
+                        imgW = Mouse.GetPosition(gridM).X - imgCanvas.Margin.Left;
+                        imgH = Mouse.GetPosition(gridM).Y - imgCanvas.Margin.Top;
+                        if (imgW < 50)
+                        {
+                            imgCanvas.Width = 50;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(RectLeftUp) + 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Width = imgW;
+                            Canvas.SetLeft(thu, Canvas.GetLeft(thu) + e.HorizontalChange);
+                        }
+                        if (imgH < 50)
+                        {
+                            imgCanvas.Height = 50;
+                            Canvas.SetTop(thu, Canvas.GetTop(RectLeftUp) + 50);
+                        }
+                        else
+                        {
+                            imgCanvas.Height = imgH;
+                            Canvas.SetTop(thu, Canvas.GetTop(thu) + e.VerticalChange);
+                        }
+                        //imgCanvas.Margin = new Thickness(imgX, imgY, 0, 0);
+                        //imgCanvas.Width += e.HorizontalChange;
+                        //imgCanvas.Height += e.VerticalChange;
+                        #endregion
                         break;
                     default:
                         break;