Skip to content

Commit

Permalink
fix: 修复Close Button命名错误
Browse files Browse the repository at this point in the history
  • Loading branch information
leven99 committed Sep 30, 2019
1 parent e148b69 commit 49702b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Style TargetType="MenuItem" x:Key="MainMenuItem">
<Setter Property="Padding" Value="3,3"/>
</Style>
<Style TargetType="Button" x:Key="MinMaxButton">
<Style TargetType="Button" x:Key="MainButton">
<Setter Property="Width" Value="36"/>
<Setter Property="Background" Value="White"/>
<Setter Property="BorderBrush" Value="White"/>
Expand Down
6 changes: 3 additions & 3 deletions Views/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@
</MenuItem>
</Menu>
<Button x:Name="MinButton" Grid.Column="2" Content=""
Style="{StaticResource MinMaxButton}" Click="MinButton_Click"/>
<Button x:Name="MaxButton" Grid.Column="3" Content="X"
Style="{StaticResource MinMaxButton}" Click="MaxButton_Click" Margin="0,0,0.1,0"/>
Style="{StaticResource MainButton}" Click="MinButton_Click"/>
<Button x:Name="CloseButton" Grid.Column="3" Content="X"
Style="{StaticResource MainButton}" Click="CloseButton_Click" Margin="0,0,0.1,0"/>
</Grid>

<!--状态栏-->
Expand Down
2 changes: 1 addition & 1 deletion Views/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ private void MinButton_Click(object sender, RoutedEventArgs e)
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void MaxButton_Click(object sender, RoutedEventArgs e)
private void CloseButton_Click(object sender, RoutedEventArgs e)
{
Close();
Application.Current.Shutdown();
Expand Down

0 comments on commit 49702b6

Please sign in to comment.