3 次代码提交 8edd091546 ... 8ef1a728f9

作者 SHA1 备注 提交日期
  向羽 孟 8ef1a728f9 解决冲突 1 周之前
  向羽 孟 e585013c6e 合并 1 周之前
  向羽 孟 49e972d3bd 优化 1 周之前
共有 1 个文件被更改,包括 7 次插入3 次删除
  1. 7 3
      MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml

+ 7 - 3
MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml

@@ -8,17 +8,21 @@
         Title="MainWindow" Height="450" Width="800" Closing="Window_Closing">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="70"/>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="#FF0050FF">
-            <Button x:Name="HomeButton" HorizontalAlignment="Left" VerticalAlignment="Center" Width="55" Height="65" Background="{x:Null}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="55"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button Grid.Column="0" x:Name="HomeButton" HorizontalAlignment="Left" VerticalAlignment="Center" Click="HomeButton_Click" Width="55" Background="{x:Null}" Height="80">
                 <StackPanel>
                     <Image Source="/FromImage/菜单_白.png" Stretch="Fill" HorizontalAlignment="Center" Height="45" Width="45"/>
                     <TextBlock Text="菜单" HorizontalAlignment="Center" Foreground="White" />
                 </StackPanel>
             </Button>
-            <StackPanel Margin="55,0,0,0" x:Name="HeardPanel" Orientation="Horizontal">
+            <StackPanel Grid.Column="1" x:Name="HeardPanel" Orientation="Horizontal">
                 <Button x:Name="DeepObjectDetectBtn" Width="55" HorizontalAlignment="Left" Click="DeepObjectDetectBtn_Click" Background="{x:Null}" Height="65">
                     <StackPanel>
                         <Image Source="/FromImage/菜单_白.png" Stretch="Fill" HorizontalAlignment="Center" Width="45"/>