Skip to content

Commit 0b13dc6

Browse files
committed
Revert "Switch to the WinUI ColorSpectrum"
This reverts commit 3c5b8ac.
1 parent 8656af8 commit 0b13dc6

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Windows.UI.Xaml.Controls.Primitives;
1616
using Windows.UI.Xaml.Media;
1717
using ColorPickerSlider = Microsoft.Toolkit.Uwp.UI.Controls.Primitives.ColorPickerSlider;
18-
using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
1918

2019
namespace Microsoft.Toolkit.Uwp.UI.Controls
2120
{
@@ -1228,7 +1227,7 @@ private void CustomPaletteColors_CollectionChanged(object sender, NotifyCollecti
12281227
/// Event handler for when the color spectrum color is changed.
12291228
/// This occurs when the user presses on the spectrum to select a new color.
12301229
/// </summary>
1231-
private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
1230+
private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Windows.UI.Xaml.Controls.ColorChangedEventArgs args)
12321231
{
12331232
// It is OK in this case to use the RGB representation
12341233
this.ScheduleColorUpdate(this.ColorSpectrumControl.Color);

Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
55
xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
66
xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
7-
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
8-
xmlns:winuiprimitives="using:Microsoft.UI.Xaml.Controls.Primitives">
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
98

109
<SolidColorBrush x:Key="CheckerboardColor0">
1110
<SolidColorBrush.Color>
@@ -121,23 +120,23 @@
121120
Orientation="Vertical" />
122121
<!-- Keep in mind the spectrum is always HSV -->
123122
<!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
124-
<winuiprimitives:ColorSpectrum x:Name="ColorSpectrumControl"
125-
Grid.Row="0"
126-
Grid.RowSpan="2"
127-
Grid.Column="1"
128-
MinWidth="256"
129-
MinHeight="256"
130-
HorizontalAlignment="Stretch"
131-
VerticalAlignment="Stretch"
132-
AutomationProperties.Name="Third Dimension"
133-
Components="{TemplateBinding ColorSpectrumComponents}"
134-
MaxHue="{TemplateBinding MaxHue}"
135-
MaxSaturation="{TemplateBinding MaxSaturation}"
136-
MaxValue="{TemplateBinding MaxValue}"
137-
MinHue="{TemplateBinding MinHue}"
138-
MinSaturation="{TemplateBinding MinSaturation}"
139-
MinValue="{TemplateBinding MinValue}"
140-
Shape="{TemplateBinding ColorSpectrumShape}" />
123+
<ColorSpectrum x:Name="ColorSpectrumControl"
124+
Grid.Row="0"
125+
Grid.RowSpan="2"
126+
Grid.Column="1"
127+
MinWidth="256"
128+
MinHeight="256"
129+
HorizontalAlignment="Stretch"
130+
VerticalAlignment="Stretch"
131+
AutomationProperties.Name="Third Dimension"
132+
Components="{TemplateBinding ColorSpectrumComponents}"
133+
MaxHue="{TemplateBinding MaxHue}"
134+
MaxSaturation="{TemplateBinding MaxSaturation}"
135+
MaxValue="{TemplateBinding MaxValue}"
136+
MinHue="{TemplateBinding MinHue}"
137+
MinSaturation="{TemplateBinding MinSaturation}"
138+
MinValue="{TemplateBinding MinValue}"
139+
Shape="{TemplateBinding ColorSpectrumShape}" />
141140
<primitives:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
142141
Grid.Row="1"
143142
Grid.RowSpan="2"

0 commit comments

Comments
 (0)