diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml index 4547c4c..85466c2 100644 --- a/Correlator/Style/FunctionButtonStyle.xaml +++ b/Correlator/Style/FunctionButtonStyle.xaml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/Correlator/Style/FunctionButtonStyle.xaml b/Correlator/Style/FunctionButtonStyle.xaml index 4547c4c..85466c2 100644 --- a/Correlator/Style/FunctionButtonStyle.xaml +++ b/Correlator/Style/FunctionButtonStyle.xaml @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/Correlator/View/HomePageProWindow.xaml b/Correlator/View/HomePageProWindow.xaml index 23c5048..9879834 100644 --- a/Correlator/View/HomePageProWindow.xaml +++ b/Correlator/View/HomePageProWindow.xaml @@ -6,6 +6,8 @@ xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="相关仪" + MinWidth="1366" + MinHeight="768" d:DesignHeight="1080" d:DesignWidth="1920" Background="#EBECF0" @@ -13,7 +15,6 @@ Icon="/Correlator;component/Image/favicon.ico" WindowStartupLocation="CenterScreen" WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -24,8 +25,8 @@ - - - + + @@ -185,27 +223,20 @@ - - + + - + - - - - - + Source="/Correlator;component/Image/l_icon0.png" /> @@ -233,320 +264,339 @@ Height="82" Margin="0,0,20,40" VerticalAlignment="Bottom" - Source="/Correlator;component/Image/r_icon5.png" /> + Source="/Correlator;component/Image/r_icon0.png" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Height="40" + Margin="10,0"> - - - + + + Height="40" + VerticalAlignment="Center"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -556,9 +606,8 @@ + - - @@ -672,13 +721,13 @@ HorizontalAlignment="Center" Orientation="Horizontal"> @@ -750,46 +799,32 @@ Margin="0,0,10,0" BorderBrush="LightGray" BorderThickness="1"> - - - - - - - - - - - - +