Skip to content

Commit 9b7756a

Browse files
committed
Set explicitly MUXC ColorPicker
1 parent 3f01d0a commit 9b7756a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

components/GradientSlider/src/GradientSlider.Events.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ protected virtual void OnThumbDragCompleted(DragCompletedEventArgs e)
4242
/// <summary>
4343
/// Called before the <see cref="ValueChanged"/> event occurs.
4444
/// </summary>
45-
/// <param name="e"><see cref="EventArgs"/> event data for the event.</param>
4645
protected virtual void OnValueChanged()
4746
{
4847
ValueChanged?.Invoke(this, EventArgs.Empty);

components/GradientSlider/src/GradientSliderThumb.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using ColorPicker = Microsoft.UI.Xaml.Controls.ColorPicker;
6+
57
namespace CommunityToolkit.WinUI.Controls;
68

79
/// <summary>

components/GradientSlider/src/GradientSliderThumbStyle.xaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
4+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
5+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
56

67
<Style BasedOn="{StaticResource DefaultGradientSliderThumb}"
78
TargetType="controls:GradientSliderThumb" />
@@ -102,7 +103,7 @@
102103
</VisualStateManager.VisualStateGroups>
103104
<FlyoutBase.AttachedFlyout>
104105
<Flyout Placement="Bottom">
105-
<ColorPicker x:Name="PART_ColorPicker" />
106+
<muxc:ColorPicker x:Name="PART_ColorPicker" />
106107
</Flyout>
107108
</FlyoutBase.AttachedFlyout>
108109
<Ellipse x:Name="SliderInnerThumb"

0 commit comments

Comments
 (0)