Browse Source

Move ColorPicker source into Avalonia.Controls.ColorPicker

pull/7842/head
robloo 4 years ago
parent
commit
dd7cca3173
  1. 0
      src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs
  2. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs
  3. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs
  4. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
  5. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs
  6. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs
  7. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs
  8. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs
  9. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs
  10. 0
      src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs
  11. 0
      src/Avalonia.Controls.ColorPicker/HsvChannel.cs
  12. 10
      src/Avalonia.Controls.ColorPicker/Themes/Default.xaml
  13. 10
      src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml
  14. 1
      src/Avalonia.Themes.Default/DefaultTheme.xaml
  15. 1
      src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml

0
src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs → src/Avalonia.Controls.ColorPicker/ColorChangedEventArgs.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorHelpers.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.Properties.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/Hsv.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/Hsv.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementAmount.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementAmount.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/IncrementDirection.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/IncrementDirection.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrum/Rgb.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrum/Rgb.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrumChannels.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrumChannels.cs

0
src/Avalonia.Controls/ColorPicker/ColorSpectrumShape.cs → src/Avalonia.Controls.ColorPicker/ColorSpectrumShape.cs

0
src/Avalonia.Controls/ColorPicker/HsvChannel.cs → src/Avalonia.Controls.ColorPicker/HsvChannel.cs

10
src/Avalonia.Themes.Default/Controls/ColorSpectrum.xaml → src/Avalonia.Controls.ColorPicker/Themes/Default.xaml

@ -1,14 +1,8 @@
<Styles xmlns="https://github.com/avaloniaui"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"
xmlns:converters="using:Avalonia.Controls.Converters">
<Design.PreviewWith>
<Border Padding="20">
<ColorSpectrum Width="256" Height="256" />
</Border>
</Design.PreviewWith>
<Styles.Resources>
<converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
<converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
@ -136,5 +130,5 @@
<Setter Property="Width" Value="48" />
<Setter Property="Height" Value="48" />
</Style>
</Styles>

10
src/Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml → src/Avalonia.Controls.ColorPicker/Themes/Fluent.xaml

@ -1,14 +1,8 @@
<Styles xmlns="https://github.com/avaloniaui"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True"
xmlns:converters="using:Avalonia.Controls.Converters">
<Design.PreviewWith>
<Border Padding="20">
<ColorSpectrum Width="256" Height="256" />
</Border>
</Design.PreviewWith>
<Styles.Resources>
<converters:EnumValueEqualsConverter x:Key="EnumValueEquals" />
<converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
@ -136,5 +130,5 @@
<Setter Property="Width" Value="48" />
<Setter Property="Height" Value="48" />
</Style>
</Styles>

1
src/Avalonia.Themes.Default/DefaultTheme.xaml

@ -11,7 +11,6 @@
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/Carousel.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CheckBox.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/CaptionButtons.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ColorSpectrum.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBox.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ComboBoxItem.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Controls/ContentControl.xaml"/>

1
src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml

@ -11,7 +11,6 @@
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ColorSpectrum.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml"/>

Loading…
Cancel
Save