自适应

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -131,9 +131,10 @@ namespace XHWK.WKTool
             #endregion
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
+                //double proportion = 1036.0 / 1276.0;
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
-                APP.W_XHMicroLessonSystemWindow.Width =1036;
-                APP.W_XHMicroLessonSystemWindow.Height =1276;
+                //APP.W_XHMicroLessonSystemWindow.Width = proportion * (PrimaryScreen.ScaleScreenSize().Height-40);
+                //APP.W_XHMicroLessonSystemWindow.Height =/*1276-*/ PrimaryScreen.ScaleScreenSize().Height-40;
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
             APP.W_XHMicroLessonSystemWindow.Show();

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"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -139,17 +139,14 @@
         </RadialGradientBrush>
     </Window.BorderBrush>
 
-    <Viewbox>
-        <Canvas Height="1036" Width="1276">
-
-
-            <Grid x:Name="GridContent" Height="1036" Width="1276">
+    <Viewbox Stretch="Fill">
+        <Grid x:Name="GridContent" Height="1036" Width="1276" >
 
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="10*"/>
+                <RowDefinition Height="10.2*"/>
                 <RowDefinition Height="86*"/>
-                <RowDefinition Height="3.5*"/>
+                <RowDefinition Height="3.8*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
                 <Grid.RowDefinitions>
@@ -157,10 +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">
                     <Button Cursor="Hand" x:Name="btnLoginType" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnLoginType_Click">
                         <StackPanel Orientation="Horizontal">
@@ -178,7 +177,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">
@@ -255,6 +257,7 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
+                </StackPanel>
             </Grid>
             <!--主内容-->
             <Grid Grid.Row="1" x:Name="GridMain" Width="1276" Visibility="Visible">
@@ -578,8 +581,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>
-        </Canvas>
+            <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

@@ -109,11 +109,23 @@ 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;
 
-            this.Top = (screeHeight - this.Height) / 2;
 
-            this.Left = (screeWidth - this.Width) / 2;
+            double splProportion = 1036.0 / 1276.0;
+
+            splOne.Height = 20;
+            splTwo.Height = 40;
+
+            //GridMain.Height= PrimaryScreen.ScaleScreenSize().Height - 40;
+
+            //this.Top = (screeHeight - this.Height) / 2;
+
+            //this.Left = (screeWidth - this.Width) / 2;
             this.ResizeMode = System.Windows.ResizeMode.CanMinimize;
             btnPrint.IsEnabled = false;