From 81c46ea0f24460791751dabd6ecbed76b421ac74 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Mon, 8 Sep 2025 15:55:37 +0800 Subject: [PATCH] feat: add color pair picker --- HFUTCourseSimulation/Dialog/EditCourse.xaml | 2 +- .../Dialog/EditCourse.xaml.cs | 14 ++--- .../HFUTCourseSimulation.csproj | 7 +++ HFUTCourseSimulation/Widget/ColorPicker.xaml | 59 ++++++++++++++++++ .../Widget/ColorPicker.xaml.cs | 60 +++++++++++++++++++ HFUTCourseSimulation/Widget/LogChecker.xaml | 4 +- 6 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 HFUTCourseSimulation/Widget/ColorPicker.xaml create mode 100644 HFUTCourseSimulation/Widget/ColorPicker.xaml.cs diff --git a/HFUTCourseSimulation/Dialog/EditCourse.xaml b/HFUTCourseSimulation/Dialog/EditCourse.xaml index 930d044..250e5cb 100644 --- a/HFUTCourseSimulation/Dialog/EditCourse.xaml +++ b/HFUTCourseSimulation/Dialog/EditCourse.xaml @@ -25,7 +25,7 @@ - + diff --git a/HFUTCourseSimulation/Dialog/EditCourse.xaml.cs b/HFUTCourseSimulation/Dialog/EditCourse.xaml.cs index 6251b37..705af88 100644 --- a/HFUTCourseSimulation/Dialog/EditCourse.xaml.cs +++ b/HFUTCourseSimulation/Dialog/EditCourse.xaml.cs @@ -85,16 +85,10 @@ namespace HFUTCourseSimulation.Dialog { CurrentCourse.Schedules.Clear(); } - private void uiColorPicker_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { - var color = Util.Win32Dialog.PickColor(); - if (color is null) return; - else CurrentCourse.Color.Background = color.Value; - } - - private void uiColorPicker_MouseRightButtonDown(object sender, MouseButtonEventArgs e) { - var color = Util.Win32Dialog.PickColor(); - if (color is null) return; - else CurrentCourse.Color.Foreground = color.Value; + private void uiColorPicker_MouseDown(object sender, MouseButtonEventArgs e) { + var widget = new Widget.ColorPicker(); + widget.CurrentColor = CurrentCourse.Color; + widget.ShowDialog(); } } diff --git a/HFUTCourseSimulation/HFUTCourseSimulation.csproj b/HFUTCourseSimulation/HFUTCourseSimulation.csproj index 3f3d830..32f71fc 100644 --- a/HFUTCourseSimulation/HFUTCourseSimulation.csproj +++ b/HFUTCourseSimulation/HFUTCourseSimulation.csproj @@ -96,6 +96,9 @@ + + ColorPicker.xaml + LogChecker.xaml @@ -123,6 +126,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/HFUTCourseSimulation/Widget/ColorPicker.xaml b/HFUTCourseSimulation/Widget/ColorPicker.xaml new file mode 100644 index 0000000..37c8c14 --- /dev/null +++ b/HFUTCourseSimulation/Widget/ColorPicker.xaml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +