合并冲突解决

MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml

@@ -5,31 +5,27 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MvvmScaffoldFrame48"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800" Loaded="Window_Loaded" Closing="Window_Closing">
+        Title="MainWindow" Height="450" Width="800" Closing="Window_Closing">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="70"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="#FF0050FF">
-            <Button x:Name="HomeButton" HorizontalAlignment="Left" VerticalAlignment="Center" Click="HomeButton_Click" Width="45" Height="65" Background="{x:Null}">
+            <Button x:Name="HomeButton" HorizontalAlignment="Left" VerticalAlignment="Center" Width="55" Height="65" Background="{x:Null}">
                 <StackPanel>
-                    <Image Source="/FromImage/菜单_白.png" Stretch="Fill" HorizontalAlignment="Center"/>
+                    <Image Source="/FromImage/菜单_白.png" Stretch="Fill" HorizontalAlignment="Center" Height="45" Width="45"/>
                     <TextBlock Text="菜单" HorizontalAlignment="Center" Foreground="White" />
                 </StackPanel>
             </Button>
-            
-        </Grid>
-        <Grid Grid.Row="1">
-            <Frame x:Name="ShowFrame" Margin="0,0,0,0" NavigationUIVisibility="Hidden"/>
-        </Grid>
-    </Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0">
-            <Button x:Name="Button" Content="目标检测" Margin="10,10,10,10" Width="80" HorizontalAlignment="Left" Click="Button_Click"/>
+            <Grid Margin="55,0,0,0">
+                <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"/>
+                        <TextBlock Text="目标检测" HorizontalAlignment="Center" Foreground="White" />
+                    </StackPanel>
+                </Button>
+            </Grid>
         </Grid>
         <Grid Grid.Row="1">
             <Frame x:Name="ShowFrame" Margin="0,0,0,0" NavigationUIVisibility="Hidden"/>

MvvmScaffoldFrame48/WPFFroms/MainWindow.xaml.cs

@@ -15,16 +15,16 @@ namespace MvvmScaffoldFrame48
             InitializeComponent();
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            Uri ShowUri = new Uri("WPFPage\\DeepObjectDetectPage.xaml", UriKind.Relative);
-            ShowFrame.Navigate(ShowUri);
-        }
-
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
 
             Environment.Exit(0);
         }
+
+        private void DeepObjectDetectBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Uri ShowUri = new Uri("WPFPage\\DeepObjectDetectPage.xaml", UriKind.Relative);
+            ShowFrame.Navigate(ShowUri);
+        }
     }
 }