From 4d4462448b4e98dc93273162900234d69340e695 Mon Sep 17 00:00:00 2001 From: robloo Date: Wed, 30 Jun 2021 16:00:59 -0400 Subject: [PATCH] chore(ColorPicker): Update to WinUI at 0b97572cdcf4e1469c9f7199e0e3f9848d8be482 Does NOT include XAML updates for WinUI v2.6 --- .../Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs | 2 +- src/Uno.UI/Microsoft/UI/Xaml/WinUIVersionLog.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs index e2876a37ca..99d79ceaac 100644 --- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs +++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/ColorPicker/ColorSpectrum.cs @@ -824,7 +824,7 @@ namespace Microsoft.UI.Xaml.Controls.Primitives // we inverted the direction of that axis in order to put more hue on the outside of the ring, // so we need to do similarly here when positioning the ellipse. if (m_componentsFromLastBitmapCreation == ColorSpectrumComponents.HueSaturation || - m_componentsFromLastBitmapCreation == ColorSpectrumComponents.ValueHue) + m_componentsFromLastBitmapCreation == ColorSpectrumComponents.SaturationHue) { sThetaValue = 360 - sThetaValue; sRValue = -sRValue - 1; diff --git a/src/Uno.UI/Microsoft/UI/Xaml/WinUIVersionLog.txt b/src/Uno.UI/Microsoft/UI/Xaml/WinUIVersionLog.txt index 67050fe282..9d2e3dc7a8 100644 --- a/src/Uno.UI/Microsoft/UI/Xaml/WinUIVersionLog.txt +++ b/src/Uno.UI/Microsoft/UI/Xaml/WinUIVersionLog.txt @@ -12,7 +12,7 @@ // // Make sure to arrange alphabetically with more-specific locations at the end. -\Controls\ColorPicker : 4c3ae34924def922e5781ceaea6b04f1eec5cb41 (without XAML style updates) -\Controls\Expander : 0b97572cdcf4e1469c9f7199e0e3f9848d8be482 -\Controls\NumberBox : 2237b09d9ba6052414ddccf3d61316de20564303 +\Controls\ColorPicker : 0b97572cdcf4e1469c9f7199e0e3f9848d8be482 (without XAML style updates for 2.5 and 2.6) +\Controls\Expander : 0b97572cdcf4e1469c9f7199e0e3f9848d8be482 +\Controls\NumberBox : 2237b09d9ba6052414ddccf3d61316de20564303 \Controls\RatingControl : 3c73749