diff --git a/MainWindow.xaml b/MainWindow.xaml index 2715472..97f99fd 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -109,8 +109,8 @@ - - + + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index cb83954..533aab2 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -35,12 +35,12 @@ namespace Audit { } - private void exit(object sender, RoutedEventArgs e) + private void Exit(object sender, RoutedEventArgs e) { Application.Current.Shutdown();//关闭全部窗口 } - private void help(object sender, RoutedEventArgs e) + private void Help(object sender, RoutedEventArgs e) { Windows.help help = new Windows.help(); help.Show();//实例化并打开信息窗口 diff --git a/View/StuffView.xaml b/View/StuffView.xaml index 7ae332f..b5a17f2 100644 --- a/View/StuffView.xaml +++ b/View/StuffView.xaml @@ -82,7 +82,7 @@ - + diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs index 543ed13..8127487 100644 --- a/View/StuffView.xaml.cs +++ b/View/StuffView.xaml.cs @@ -108,8 +108,8 @@ namespace Audit.View if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)//打开调色盘 { System.Drawing.Color DColor = colorDialog.Color;////获取选中色彩信息 - System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换 - MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//配置ARGB参数 + //System.Windows.Media.Color MColor = new System.Windows.Media.Color();//转换 + System.Windows.Media.Color MColor = System.Windows.Media.Color.FromArgb(DColor.A, DColor.R, DColor.G, DColor.B);//转换并配置ARGB参数 stuff_Color.Background = new SolidColorBrush(MColor);//ARGB参数输出至stuff_Color的背景色 stuff_Color.Foreground = new SolidColorBrush(MColor);//ARGB参数输出至stuff_Color的前景色 string colorCode = Convert.ToString(DColor.B,16) + Convert.ToString(DColor.G,16) + Convert.ToString(DColor.R,16);//反向十六进制RGB