From dd7cca317365f06419f73d6091c003ff56267986 Mon Sep 17 00:00:00 2001 From: robloo Date: Sat, 16 Apr 2022 22:17:12 -0400 Subject: [PATCH] Move ColorPicker source into Avalonia.Controls.ColorPicker --- .../ColorChangedEventArgs.cs | 0 .../ColorSpectrum/ColorHelpers.cs | 0 .../ColorSpectrum/ColorSpectrum.Properties.cs | 0 .../ColorSpectrum/ColorSpectrum.cs | 0 .../ColorSpectrum/Hsv.cs | 0 .../ColorSpectrum/IncrementAmount.cs | 0 .../ColorSpectrum/IncrementDirection.cs | 0 .../ColorSpectrum/Rgb.cs | 0 .../ColorSpectrumChannels.cs | 0 .../ColorSpectrumShape.cs | 0 .../HsvChannel.cs | 0 .../Themes/Default.xaml} | 10 ++-------- .../Themes/Fluent.xaml} | 10 ++-------- src/Avalonia.Themes.Default/DefaultTheme.xaml | 1 - .../Controls/FluentControls.xaml | 1 - 15 files changed, 4 insertions(+), 18 deletions(-) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorChangedEventArgs.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/ColorHelpers.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/ColorSpectrum.Properties.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/ColorSpectrum.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/Hsv.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/IncrementAmount.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/IncrementDirection.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrum/Rgb.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrumChannels.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/ColorSpectrumShape.cs (100%) rename src/{Avalonia.Controls/ColorPicker => Avalonia.Controls.ColorPicker}/HsvChannel.cs (100%) rename src/{Avalonia.Themes.Default/Controls/ColorSpectrum.xaml => Avalonia.Controls.ColorPicker/Themes/Default.xaml} (97%) rename src/{Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml => Avalonia.Controls.ColorPicker/Themes/Fluent.xaml} (97%) diff --git a/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs b/src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs rename to src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/Hsv.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/Hsv.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementAmount.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementAmount.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementDirection.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementDirection.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/Rgb.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrum/Rgb.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrumChannels.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrumChannels.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrumShape.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/ColorSpectrumShape.cs rename to src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs diff --git a/src/Avalonia.Controls/ColorPicker/HsvChannel.cs b/src/Avalonia.Controls.ColorPicker/HsvChannel.cs similarity index 100% rename from src/Avalonia.Controls/ColorPicker/HsvChannel.cs rename to src/Avalonia.Controls.ColorPicker/HsvChannel.cs diff --git a/src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Default.xaml similarity index 97% rename from src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml rename to src/Avalonia.Controls.ColorPicker/Themes/Default.xaml index 338ea69dac..832daf8853 100644 --- a/src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml +++ b/src/Avalonia.Controls.ColorPicker/Themes/Default.xaml @@ -1,14 +1,8 @@ - - - - - - - @@ -136,5 +130,5 @@ - + diff --git a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml similarity index 97% rename from src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml rename to src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml index 5de6daea11..545702ea84 100644 --- a/src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml +++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml @@ -1,14 +1,8 @@ - - - - - - - @@ -136,5 +130,5 @@ - + diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml index 682f395e5b..468b723f5b 100644 --- a/src/Avalonia.Themes.Default/DefaultTheme.xaml +++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml @@ -11,7 +11,6 @@ - diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml index b7d35ad5cc..5b217e4764 100644 --- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml +++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml @@ -11,7 +11,6 @@ -