Skip to content

Fix ColorPicker CustomPaletteColors default property value #3943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-hawker merged 9 commits into from
May 3, 2021
Merged

Fix ColorPicker CustomPaletteColors default property value #3943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
950894a
Fix ColorPicker CustomPaletteColors default property value
robloo Apr 16, 2021
21fb014
Merge branch 'master' into color-picker-prop-fix
robloo Apr 23, 2021
21a9785
Use null instead of UnsetValue for default property values
robloo Apr 23, 2021
3c5b8ac
Switch to the WinUI ColorSpectrum
robloo Apr 23, 2021
b5ec831
Remove exceptions in ColorPicker converters and use UnsetValue
robloo Apr 23, 2021
34bbbc8
Derive from the WinUI ColorPicker
robloo Apr 23, 2021
8656af8
Merge branch 'master' into color-picker-prop-fix
robloo Apr 29, 2021
0b13dc6
Revert "Switch to the WinUI ColorSpectrum"
robloo Apr 29, 2021
e86bfee
Revert "Derive from the WinUI ColorPicker"
robloo Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial class ColorPicker
nameof(CustomPaletteColors),
typeof(ObservableCollection<Windows.UI.Color>),
typeof(ColorPicker),
new PropertyMetadata(Windows.UI.Color.FromArgb(0x00, 0x00, 0x00, 0x00)));
new PropertyMetadata(null));

/// <summary>
/// Gets the list of custom palette colors.
Expand Down Expand Up @@ -64,7 +64,7 @@ public int CustomPaletteColumnCount
nameof(CustomPalette),
typeof(IColorPalette),
typeof(ColorPicker),
new PropertyMetadata(DependencyProperty.UnsetValue));
new PropertyMetadata(null));

/// <summary>
/// Gets or sets the custom color palette.
Expand Down
9 changes: 6 additions & 3 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System;
using Microsoft.Toolkit.Uwp.Helpers;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Media;

Expand Down Expand Up @@ -40,7 +41,8 @@ public object Convert(
}
else
{
throw new ArgumentException("Invalid color value provided");
// Invalid color value provided
return DependencyProperty.UnsetValue;
}

// Get the value component delta
Expand All @@ -50,7 +52,8 @@ public object Convert(
}
catch
{
throw new ArgumentException("Invalid parameter provided, unable to convert to integer");
// Invalid parameter provided, unable to convert to integer
return DependencyProperty.UnsetValue;
}

// Specially handle minimum (black) and maximum (white)
Expand Down Expand Up @@ -119,7 +122,7 @@ public object ConvertBack(
object parameter,
string language)
{
throw new NotImplementedException();
return DependencyProperty.UnsetValue;
}
}
}
10 changes: 7 additions & 3 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System;
using Microsoft.Toolkit.Uwp.Helpers;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Media;

Expand Down Expand Up @@ -34,7 +35,8 @@ public object Convert(
}
else
{
throw new ArgumentException("Invalid color value provided");
// Invalid color value provided
return DependencyProperty.UnsetValue;
}

string hexColor = color.ToHex().Replace("#", string.Empty);
Expand All @@ -58,7 +60,8 @@ public object ConvertBack(
}
catch
{
throw new ArgumentException("Invalid hex color value provided");
// Invalid hex color value provided
return DependencyProperty.UnsetValue;
}
}
else
Expand All @@ -69,7 +72,8 @@ public object ConvertBack(
}
catch
{
throw new ArgumentException("Invalid hex color value provided");
// Invalid hex color value provided
return DependencyProperty.UnsetValue;
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Media;

Expand Down Expand Up @@ -40,7 +41,8 @@ public object Convert(
}
else
{
throw new ArgumentException("Invalid color value provided");
// Invalid color value provided
return DependencyProperty.UnsetValue;
}

// Get the default color when transparency is high
Expand Down Expand Up @@ -81,7 +83,7 @@ public object ConvertBack(
object parameter,
string language)
{
throw new NotImplementedException();
return DependencyProperty.UnsetValue;
}

/// <summary>
Expand Down
6 changes: 4 additions & 2 deletions Microsoft.Toolkit.Uwp.UI/Converters/ColorToDisplayNameConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Media;

Expand Down Expand Up @@ -33,7 +34,8 @@ public object Convert(
}
else
{
throw new ArgumentException("Invalid color value provided");
// Invalid color value provided
return DependencyProperty.UnsetValue;
}

return ColorHelper.ToDisplayName(color);
Expand All @@ -46,7 +48,7 @@ public object ConvertBack(
object parameter,
string language)
{
throw new NotImplementedException();
return DependencyProperty.UnsetValue;
}
}
}