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

Rename 'EnumToBooleanConverter' to 'EnumToBoolConverter' 

Bool is shorter and is also slightly more commonly used in other converters. Bool matches the type as written in C# as well.
pull/8215/head
robloo 4 years ago
parent
b8be7ba4cb
commit
10bc7b38cb
4 changed files with 29 additions and 30 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. 14
      src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
  2. 14
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
  3. 18
      src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
  4. 13
      src/Avalonia.Controls/Converters/EnumToBoolConverter.cs

14
src/Avalonia.Controls.ColorPicker/Themes/Default/ColorSpectrum.xaml
View File

@ -5,7 +5,7 @@
x:CompileBindings="True"> x:CompileBindings="True">
<Styles.Resources> <Styles.Resources>
<converters:EnumToBooleanConverter x:Key="EnumToBoolean" /> <converters:EnumToBoolConverter x:Key="EnumToBool" />
<converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" /> <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
<converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" /> <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
</Styles.Resources> </Styles.Resources>
@ -25,26 +25,26 @@
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Rectangle x:Name="PART_SpectrumOverlayRectangle" <Rectangle x:Name="PART_SpectrumOverlayRectangle"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Ellipse x:Name="PART_SpectrumEllipse" <Ellipse x:Name="PART_SpectrumEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Ellipse x:Name="PART_SpectrumOverlayEllipse" <Ellipse x:Name="PART_SpectrumOverlayEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Canvas x:Name="PART_InputTarget" <Canvas x:Name="PART_InputTarget"
Background="Transparent" Background="Transparent"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -73,14 +73,14 @@
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Ellipse x:Name="BorderEllipse" <Ellipse x:Name="BorderEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
</Panel> </Panel>
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>

14
src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorSpectrum.xaml
View File

@ -5,7 +5,7 @@
x:CompileBindings="True"> x:CompileBindings="True">
<Styles.Resources> <Styles.Resources>
<converters:EnumToBooleanConverter x:Key="EnumToBoolean" /> <converters:EnumToBoolConverter x:Key="EnumToBool" />
<converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" /> <converters:CornerRadiusToDoubleConverter x:Key="TopLeftCornerRadius" Corner="TopLeft" />
<converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" /> <converters:CornerRadiusToDoubleConverter x:Key="BottomRightCornerRadius" Corner="BottomRight" />
</Styles.Resources> </Styles.Resources>
@ -25,26 +25,26 @@
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Rectangle x:Name="PART_SpectrumOverlayRectangle" <Rectangle x:Name="PART_SpectrumOverlayRectangle"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Ellipse x:Name="PART_SpectrumEllipse" <Ellipse x:Name="PART_SpectrumEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Ellipse x:Name="PART_SpectrumOverlayEllipse" <Ellipse x:Name="PART_SpectrumOverlayEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
<Canvas x:Name="PART_InputTarget" <Canvas x:Name="PART_InputTarget"
Background="Transparent" Background="Transparent"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -73,14 +73,14 @@
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}" IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Box}}"
RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}" RadiusX="{TemplateBinding CornerRadius, Converter={StaticResource TopLeftCornerRadius}}"
RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" /> RadiusY="{TemplateBinding CornerRadius, Converter={StaticResource BottomRightCornerRadius}}" />
<Ellipse x:Name="BorderEllipse" <Ellipse x:Name="BorderEllipse"
IsHitTestVisible="False" IsHitTestVisible="False"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" /> IsVisible="{TemplateBinding Shape, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static controls:ColorSpectrumShape.Ring}}" />
</Panel> </Panel>
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>

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

@ -12,7 +12,7 @@
<pc:ThirdComponentConverter x:Key="ThirdComponent" /> <pc:ThirdComponentConverter x:Key="ThirdComponent" />
<converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" /> <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayName" />
<converters:ColorToHexConverter x:Key="ColorToHex" /> <converters:ColorToHexConverter x:Key="ColorToHex" />
<converters:EnumToBooleanConverter x:Key="EnumToBoolean" /> <converters:EnumToBoolConverter x:Key="EnumToBool" />
<globalization:NumberFormatInfo x:Key="ComponentNumberFormatInfo" NumberDecimalDigits="0" /> <globalization:NumberFormatInfo x:Key="ComponentNumberFormatInfo" NumberDecimalDigits="0" />
<x:Double x:Key="ColorViewTabStripHeight">48</x:Double> <x:Double x:Key="ColorViewTabStripHeight">48</x:Double>
<!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg --> <!-- Fluent UI System Icons : ic_fluent_inking_tool_20_regular.svg -->
@ -351,12 +351,12 @@
Grid.Column="0" Grid.Column="0"
Content="RGB" Content="RGB"
CornerRadius="4,0,0,4" CornerRadius="4,0,0,4"
IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=TwoWay}" /> IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=TwoWay}" />
<RadioButton x:Name="HsvRadioButton" <RadioButton x:Name="HsvRadioButton"
Grid.Column="1" Grid.Column="1"
Content="HSV" Content="HSV"
CornerRadius="0,4,4,0" CornerRadius="0,4,4,0"
IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=TwoWay}" /> IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=TwoWay}" />
</Grid> </Grid>
<Grid x:Name="HexInputGrid" <Grid x:Name="HexInputGrid"
Grid.Column="2" Grid.Column="2"
@ -403,11 +403,11 @@
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="R" Text="R"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}"/> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}"/>
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="H" Text="H"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" /> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" />
</Panel> </Panel>
</Border> </Border>
<NumericUpDown x:Name="Component1NumericUpDown" <NumericUpDown x:Name="Component1NumericUpDown"
@ -451,11 +451,11 @@
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="G" Text="G"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}" /> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}" />
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="S" Text="S"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" /> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" />
</Panel> </Panel>
</Border> </Border>
<NumericUpDown x:Name="Component2NumericUpDown" <NumericUpDown x:Name="Component2NumericUpDown"
@ -499,11 +499,11 @@
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="B" Text="B"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}" /> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Rgba}, Mode=OneWay}" />
<TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}" <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="V" Text="V"
IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolean}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" /> IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBool}, ConverterParameter={x:Static local:ColorModel.Hsva}, Mode=OneWay}" />
</Panel> </Panel>
</Border> </Border>
<NumericUpDown x:Name="Component3NumericUpDown" <NumericUpDown x:Name="Component3NumericUpDown"

13
src/Avalonia.Controls/Converters/EnumToBooleanConverter.cs → src/Avalonia.Controls/Converters/EnumToBoolConverter.cs
View File

@ -12,7 +12,7 @@ namespace Avalonia.Controls.Converters
/// <remarks> /// <remarks>
/// This converter is useful to enable binding of radio buttons with a selected enum value. /// This converter is useful to enable binding of radio buttons with a selected enum value.
/// </remarks> /// </remarks>
public class EnumToBooleanConverter : IValueConverter public class EnumToBoolConverter : IValueConverter
{ {
/// <inheritdoc/> /// <inheritdoc/>
public object? Convert( public object? Convert(
@ -44,14 +44,13 @@ namespace Avalonia.Controls.Converters
object? parameter, object? parameter,
CultureInfo culture) CultureInfo culture)
{ {
if (value is bool boolValue) if (value is bool boolValue &&
boolValue == true)
{ {
return boolValue ? parameter : BindingOperations.DoNothing; return parameter;
}
else
{
return BindingOperations.DoNothing;
} }
return BindingOperations.DoNothing;
} }
} }
} }
Write Preview
Loading…
Cancel
Save