diff --git a/View/StuffView.xaml b/View/StuffView.xaml index 7aa8d81..473e682 100644 --- a/View/StuffView.xaml +++ b/View/StuffView.xaml @@ -112,7 +112,7 @@ - + diff --git a/View/StuffView.xaml.cs b/View/StuffView.xaml.cs index 177ccf0..838cf22 100644 --- a/View/StuffView.xaml.cs +++ b/View/StuffView.xaml.cs @@ -38,14 +38,6 @@ namespace Audit.View private void Button_Delete(object sender, RoutedEventArgs e) { - System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog(); - if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - - // System.Drawing.SolidBrush sb = new System.Drawing.SolidBrush(color); - // SolidColorBrush solidColorBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(sb.Color.A, sb.Color.R, sb.Color.G, sb.Color.B)); - // TextBox.stuff_Color.Background = solidColorBrush; - } } private void DataGridStuff_MouseDoubleClick(object sender, MouseButtonEventArgs e) @@ -71,11 +63,16 @@ namespace Audit.View if (DataGridStuff_ProductType.ToString() == "2") stuff_ProductType.Text = "粉体助剂"; } - private void stuff_Color_TextChanged(object sender, TextChangedEventArgs e) + private void stuff_Color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//色彩框双击事件 { - ColorDialog colorDialog = new ColorDialog(); - + System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();//打开调色盘页面 + if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + // System.Drawing.SolidBrush sb = new System.Drawing.SolidBrush(color); + // SolidColorBrush solidColorBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(sb.Color.A, sb.Color.R, sb.Color.G, sb.Color.B)); + // TextBox.stuff_Color.Background = solidColorBrush; + } } } }