Browse Source

Update palettes used in the ColorPickerPage

pull/9266/head
robloo 4 years ago
parent
commit
c959c0594f
  1. 21
      samples/ControlCatalog/Pages/ColorPickerPage.xaml
  2. 1
      samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs

21
samples/ControlCatalog/Pages/ColorPickerPage.xaml

@ -24,18 +24,19 @@
HsvColor="hsv(120, 1, 1)" HsvColor="hsv(120, 1, 1)"
Margin="0,50,0,0"> Margin="0,50,0,0">
<ColorPicker.Palette> <ColorPicker.Palette>
<controls:FlatColorPalette /> <controls:FlatHalfColorPalette />
</ColorPicker.Palette> </ColorPicker.Palette>
</ColorPicker> </ColorPicker>
<Grid Grid.Column="2" <Grid Grid.Column="2"
Grid.Row="0" Grid.Row="0"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto"> RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<ColorSpectrum x:Name="ColorSpectrum1" <ColorSpectrum x:Name="ColorSpectrum1"
Grid.Row="0" Grid.Row="0"
Color="Red" Color="Red"
CornerRadius="10" CornerRadius="10"
Height="256" Height="256"
Width="256" /> Width="256" />
<!-- HSV Sliders -->
<ColorSlider Grid.Row="1" <ColorSlider Grid.Row="1"
Margin="0,10,0,0" Margin="0,10,0,0"
ColorComponent="Component1" ColorComponent="Component1"
@ -53,7 +54,21 @@
ColorComponent="Alpha" ColorComponent="Alpha"
ColorModel="Hsva" ColorModel="Hsva"
HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" /> HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
<ColorPreviewer Grid.Row="5" <!-- RGB Sliders -->
<!--<ColorSlider Grid.Row="5"
Margin="0,10,0,0"
ColorComponent="Component1"
ColorModel="Rgba"
HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
<ColorSlider Grid.Row="6"
ColorComponent="Component2"
ColorModel="Rgba"
HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
<ColorSlider Grid.Row="7"
ColorComponent="Component3"
ColorModel="Rgba"
HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />-->
<ColorPreviewer Grid.Row="8"
IsAccentColorsVisible="False" IsAccentColorsVisible="False"
HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" /> HsvColor="{Binding HsvColor, ElementName=ColorSpectrum1}" />
</Grid> </Grid>

1
samples/ControlCatalog/Pages/ColorPickerPage.xaml.cs

@ -20,6 +20,7 @@ namespace ControlCatalog.Pages
Color = Colors.Blue, Color = Colors.Blue,
Margin = new Thickness(0, 50, 0, 0), Margin = new Thickness(0, 50, 0, 0),
HorizontalAlignment = HorizontalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center,
Palette = new MaterialHalfColorPalette(),
}; };
Grid.SetColumn(colorPicker, 2); Grid.SetColumn(colorPicker, 2);
Grid.SetRow(colorPicker, 1); Grid.SetRow(colorPicker, 1);

Loading…
Cancel
Save