自适应

#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

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

@@ -8,7 +8,7 @@
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="1036" Width="1276" 
+        Title="星火微课系统" Height="1036" Width="1290" 
     WindowStyle="None"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
@@ -139,14 +139,14 @@
         </RadialGradientBrush>
     </Window.BorderBrush>
 
-    <Viewbox Stretch="Fill">
-        <Grid x:Name="GridContent" Height="1036" Width="1276" >
+
+        <Grid x:Name="GridContent" Height="1030" Width="1276" >
 
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="10.2*"/>
-                <RowDefinition Height="86*"/>
-                <RowDefinition Height="3.8*"/>
+                <RowDefinition Height="10*"/>
+                <RowDefinition Height="85*"/>
+                <RowDefinition Height="5*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
                 <Grid.RowDefinitions>
@@ -154,13 +154,12 @@
                     <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
                 <!--第一行-->
-                <StackPanel Orientation="Horizontal" Grid.Row="0" x:Name="splOne">
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,2,10,0">
                     <Image Source="./Images/microLessonSystem_0.png"/>
                     <TextBlock Text="星火微课系统" FontSize="14" Padding="5,0,0,0" Foreground="#FFFFFF"/>
                 </StackPanel>
 
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,10,0">
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,2,20,0">
                     <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
                         <StackPanel Orientation="Horizontal">
                             <Image Source="./Images/microLessonSystem_9.png"/>
@@ -177,10 +176,10 @@
                         <Image Source="./Images/microLessonSystem_10.png"/>
                     </Button>
                 </StackPanel>
-                </StackPanel>
+          
 
                 <!--第二行-->
-                <StackPanel Grid.Row="1" x:Name="splTwo" Orientation="Horizontal">
+          
                 <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,6,0,0">
                     <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
                         <StackPanel Orientation="Vertical">
@@ -257,10 +256,12 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
-                </StackPanel>
+
+      
             </Grid>
+
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain" Width="1276" Visibility="Visible">
+            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
                 <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
                     <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
                         <Grid>
@@ -551,19 +552,19 @@
                     <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
 
-                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,2,0,0" Click="BtnRed_Click">
+                    <Button Cursor="Hand" x:Name="btnRed" Background="#FF0000" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnRed_Click">
                         <Image x:Name="imgRed" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Visible"/>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,2,0,0" Click="BtnGray_Click">
+                <Button Cursor="Hand" x:Name="btnGray" Background="#333333" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnGray_Click">
                         <Image x:Name="imgGray" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,2,0,0" Click="BtnCyanBlue_Click">
+                <Button Cursor="Hand" x:Name="btnCyanBlue" Background="#63D600" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnCyanBlue_Click">
                         <Image x:Name="imgCyanBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,2,0,0" Click="BtnYellow_Click">
+                <Button Cursor="Hand" x:Name="btnYellow" Background="#FFBC00" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnYellow_Click">
                         <Image x:Name="imgYellow" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,2,0,0" Click="BtnBlue_Click">
+                <Button Cursor="Hand" x:Name="btnBlue" Background="#00B4FC" Width="20" Height="20" Margin="5,-15,0,0" Click="BtnBlue_Click">
                         <Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
                     </Button>
                     <TextBlock Text="粗细：" FontSize="14" Padding="15,5,0,0" Margin="5,5,0,0"/>
@@ -581,7 +582,7 @@
                     <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,5,5,0"/>
                 </StackPanel>
             </Grid>
-            <Button Content="Button" HorizontalAlignment="Left" Margin="584,40,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
+   
         </Grid>
-    </Viewbox>
+
 </Window>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -28,6 +28,8 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows.Controls.Primitives;
 using System.Drawing;
+using System.Linq;
+
 
 namespace XHWK.WKTool
 {
@@ -109,17 +111,14 @@ namespace XHWK.WKTool
         {
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
-            double proportion = 1036.0 / 1276.0;
-            Width = proportion * (PrimaryScreen.ScaleScreenSize().Height - 40);
-            Height =/*1276-*/ PrimaryScreen.ScaleScreenSize().Height - 40;
-            GridContent.Width = Width;
-            GridContent.Height = Width;
-
+            double proportion = 1036.0 / 1290.0;
+            Width =  (PrimaryScreen.ScaleWorkingAreaSize.Height)/proportion-(BorderThickness.Left+ BorderThickness.Right) ;
+            Height = PrimaryScreen.ScaleWorkingAreaSize.Height-(BorderThickness.Top+BorderThickness.Bottom);
+            GridContent.Width = Width-14;
+            GridContent.Height = Height;
 
-            double splProportion = 1036.0 / 1276.0;
+ 
 
-            splOne.Height = 20;
-            splTwo.Height = 40;
 
             //GridMain.Height= PrimaryScreen.ScaleScreenSize().Height - 40;
 
@@ -2720,14 +2719,14 @@ namespace XHWK.WKTool
             }
             catch (Exception ex)
             {
-                if(ex.Message.ToString().Equals("{\"The document appears to be corrupted and cannot be loaded.\"}"))
-                {
-                    MessageWindow.Show("Word文件无效或者Word文件被加密！");
-                }
-                else
-                {
-                    MessageWindow.Show("文档已打开,请关闭后重试！");
-                }
+                //if(ex.Message.ToString().Equals("{\"The document appears to be corrupted and cannot be loaded.\"}"))
+                //{
+                //    MessageWindow.Show("Word文件无效或者Word文件被加密！");
+                //}
+                //else
+                //{
+                    MessageWindow.Show("该文件无法使用！");
+                //}
                 LogHelper.WriteErrLog("【导入方法（ConvertWordToImage）】错误日志：" + ex.Message, ex);
             }
             return images;
@@ -3432,12 +3431,30 @@ namespace XHWK.WKTool
             }
         }
         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)
@@ -3475,36 +3492,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;