tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Complete initial ColorPicker

pull/8215/head
robloo 4 years ago
parent
0824c874fc
commit
5cd0ea6805
3 changed files with 31 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs
  2. 31
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
  3. 16
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml

3
src/Avalonia.Controls.ColorPicker/ColorPicker/ColorPicker.cs
View File

@ -7,7 +7,8 @@ using System.Threading.Tasks;
namespace Avalonia.Controls namespace Avalonia.Controls
{ {
/// <summary> /// <summary>
/// /// Presents a color for user editing using a spectrum, palette and component sliders within a drop down.
/// Editing is available when the drop down flyout is opened; otherwise, only the preview color is shown.
/// </summary> /// </summary>
public class ColorPicker : ColorView public class ColorPicker : ColorView
{ {

31
src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorPicker.xaml
View File

@ -2,10 +2,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Avalonia.Controls" xmlns:local="using:Avalonia.Controls"
xmlns:converters="using:Avalonia.Controls.Converters" xmlns:converters="using:Avalonia.Controls.Converters"
x:CompileBindings="True"> x:CompileBindings="False">
<Styles.Resources> <Styles.Resources>
<converters:ToBrushConverter x:Key="ToBrush" /> <converters:ToBrushConverter x:Key="ToBrush" />
<converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="TopLeft, BottomLeft"/>
</Styles.Resources> </Styles.Resources>
<Style Selector="ColorPicker"> <Style Selector="ColorPicker">
@ -18,7 +19,9 @@
<DropDownButton CornerRadius="{TemplateBinding CornerRadius}" <DropDownButton CornerRadius="{TemplateBinding CornerRadius}"
Height="{TemplateBinding Height}" Height="{TemplateBinding Height}"
Width="{TemplateBinding Width}" Width="{TemplateBinding Width}"
Padding="0,0,8,0" HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
Padding="0,0,10,0"
UseLayoutRounding="False"> UseLayoutRounding="False">
<DropDownButton.Styles> <DropDownButton.Styles>
<Style Selector="FlyoutPresenter.NoPadding"> <Style Selector="FlyoutPresenter.NoPadding">
@ -27,24 +30,32 @@
</DropDownButton.Styles> </DropDownButton.Styles>
<DropDownButton.Content> <DropDownButton.Content>
<!-- Preview color --> <!-- Preview color -->
<Border Background="{Binding $parent[ColorPicker].HsvColor, Converter={StaticResource ToBrush}, Mode=OneWay}" <Panel>
CornerRadius="4,0,0,4" <Border Background="{StaticResource CheckeredBackgroundBrush}"
Margin="0,0,3,0" CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" /> VerticalAlignment="Stretch"
Margin="1,1,0,1" />
<Border Background="{Binding HsvColor, ElementName=FlyoutColorView, Converter={StaticResource ToBrush}, Mode=OneWay}"
CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Margin="1,1,0,1" />
</Panel>
</DropDownButton.Content> </DropDownButton.Content>
<DropDownButton.Flyout> <DropDownButton.Flyout>
<Flyout FlyoutPresenterClasses="NoPadding"> <Flyout FlyoutPresenterClasses="NoPadding">
<!-- Skip the following: <!-- Skip the following:
- Color
- CustomPaletteColors - CustomPaletteColors
--> -->
<ColorView ColorModel="{TemplateBinding ColorModel}" <ColorView x:Name="FlyoutColorView"
Color="{Binding $parent[ColorPicker].Color, Mode=TwoWay}"
ColorModel="{Binding $parent[ColorPicker].ColorModel, Mode=TwoWay}"
ColorSpectrumComponents="{TemplateBinding ColorSpectrumComponents}" ColorSpectrumComponents="{TemplateBinding ColorSpectrumComponents}"
ColorSpectrumShape="{TemplateBinding ColorSpectrumShape}" ColorSpectrumShape="{TemplateBinding ColorSpectrumShape}"
CustomPaletteColumnCount="{TemplateBinding CustomPaletteColumnCount}" CustomPaletteColumnCount="{TemplateBinding CustomPaletteColumnCount}"
CustomPalette="{TemplateBinding CustomPalette}" CustomPalette="{TemplateBinding CustomPalette}"
HsvColor="{Binding $parent[ColorPicker].HsvColor}" HsvColor="{Binding $parent[ColorPicker].HsvColor, Mode=TwoWay}"
IsAlphaEnabled="{TemplateBinding IsAlphaEnabled}" IsAlphaEnabled="{TemplateBinding IsAlphaEnabled}"
IsAlphaSliderVisible="{TemplateBinding IsAlphaSliderVisible}" IsAlphaSliderVisible="{TemplateBinding IsAlphaSliderVisible}"
IsAlphaTextInputVisible="{TemplateBinding IsAlphaTextInputVisible}" IsAlphaTextInputVisible="{TemplateBinding IsAlphaTextInputVisible}"

16
src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
View File

@ -152,7 +152,7 @@
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="2" Grid.RowSpan="2"
Components="{TemplateBinding ColorSpectrumComponents}" Components="{TemplateBinding ColorSpectrumComponents}"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
MinHue="{TemplateBinding MinHue}" MinHue="{TemplateBinding MinHue}"
MaxHue="{TemplateBinding MaxHue}" MaxHue="{TemplateBinding MaxHue}"
MinSaturation="{TemplateBinding MinSaturation}" MinSaturation="{TemplateBinding MinSaturation}"
@ -187,7 +187,7 @@
</Border> </Border>
</TabItem.Header> </TabItem.Header>
<ListBox Items="{TemplateBinding CustomPaletteColors}" <ListBox Items="{TemplateBinding CustomPaletteColors}"
SelectedItem="{Binding $parent[ColorView].Color}" SelectedItem="{Binding Color, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
UseLayoutRounding="False" UseLayoutRounding="False"
Margin="12"> Margin="12">
<ListBox.Styles> <ListBox.Styles>
@ -421,7 +421,7 @@
TickFrequency="1" TickFrequency="1"
ColorComponent="Component1" ColorComponent="Component1"
ColorModel="{TemplateBinding ColorModel, Mode=OneWay}" ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
@ -467,7 +467,7 @@
TickFrequency="1" TickFrequency="1"
ColorComponent="Component2" ColorComponent="Component2"
ColorModel="{TemplateBinding ColorModel, Mode=OneWay}" ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
@ -513,7 +513,7 @@
TickFrequency="1" TickFrequency="1"
ColorComponent="Component3" ColorComponent="Component3"
ColorModel="{TemplateBinding ColorModel, Mode=OneWay}" ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
@ -554,7 +554,7 @@
TickFrequency="1" TickFrequency="1"
ColorComponent="Alpha" ColorComponent="Alpha"
ColorModel="{TemplateBinding ColorModel, Mode=OneWay}" ColorModel="{TemplateBinding ColorModel, Mode=OneWay}"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Margin="12,0,0,0" Margin="12,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
@ -564,8 +564,8 @@
<!-- Previewer --> <!-- Previewer -->
<primitives:ColorPreviewer Grid.Row="1" <primitives:ColorPreviewer Grid.Row="1"
ShowAccentColors="True" ShowAccentColors="True"
HsvColor="{Binding $parent[ColorView].HsvColor}" HsvColor="{Binding HsvColor, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
Margin="12,0,12,12" /> Margin="12,-5,12,7" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

Write Preview
Loading…
Cancel
Save