Skip to content

Commit

Permalink
Merge pull request #455 from irihitech/clean
Browse files Browse the repository at this point in the history 
Replace x:Name to Name
  • Loading branch information
@rabbitism
rabbitism authored Nov 7, 2024
2 parents c5623fa + 0858f01 commit 90dfa3b
Show file tree
Hide file tree
Showing 33 changed files with 215 additions and 215 deletions.
6 changes: 3 additions & 3 deletions demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,22 @@
</DataGrid.Columns>
</DataGrid>
</TabItem>
<TabItem x:Name="EditableTab" Header="Editable">
<TabItem Name="EditableTab" Header="Editable">
<Grid Margin="8" RowDefinitions="Auto,*,Auto">
<StackPanel
Grid.Row="0"
Orientation="Horizontal"
Spacing="4">
<TextBlock VerticalAlignment="Center" Text="FontSize:" />
<Slider
x:Name="FontSizeSlider"
Name="FontSizeSlider"
Width="100"
VerticalAlignment="Center"
Maximum="30"
Minimum="5"
Value="14" />
<CheckBox
x:Name="IsThreeStateCheckBox"
Name="IsThreeStateCheckBox"
Content="IsThreeState"
IsChecked="False" />
</StackPanel>
Expand Down
50 changes: 25 additions & 25 deletions src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<!-- Backgrounds -->
<!-- TODO: Background="{DynamicResource ColorViewTabBackgroundBrush}" -->
<Border
x:Name="ContentBackgroundBorder"
Name="ContentBackgroundBorder"
Grid.Row="0"
Grid.RowSpan="2"
Height="{TemplateBinding Height}"
Expand All @@ -92,7 +92,7 @@
CornerRadius="{TemplateBinding CornerRadius}" />

<TabControl
x:Name="PART_TabControl"
Name="PART_TabControl"
Grid.Row="0"
Padding="0"
VerticalAlignment="Stretch"
Expand Down Expand Up @@ -129,7 +129,7 @@
<ColumnDefinition Width="Auto" MinWidth="32" />
</Grid.ColumnDefinitions>
<primitives:ColorSlider
x:Name="ColorSpectrumThirdComponentSlider"
Name="ColorSpectrumThirdComponentSlider"
Grid.Column="0"
Margin="0,0,12,0"
HorizontalAlignment="Center"
Expand All @@ -143,7 +143,7 @@
IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}"
Orientation="Vertical" />
<primitives:ColorSpectrum
x:Name="ColorSpectrum"
Name="ColorSpectrum"
Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Expand All @@ -157,7 +157,7 @@
MinValue="{TemplateBinding MinValue}"
Shape="{TemplateBinding ColorSpectrumShape}" />
<primitives:ColorSlider
x:Name="ColorSpectrumAlphaSlider"
Name="ColorSpectrumAlphaSlider"
Grid.Column="2"
Margin="12,0,0,0"
HorizontalAlignment="Center"
Expand Down Expand Up @@ -281,7 +281,7 @@
CornerRadius="3">
<Grid ColumnDefinitions="1*,1*" IsVisible="{TemplateBinding IsColorModelVisible}">
<RadioButton
x:Name="RgbRadioButton"
Name="RgbRadioButton"
Grid.Column="0"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Expand All @@ -293,7 +293,7 @@
Mode=TwoWay}"
Theme="{DynamicResource ColorViewRadioButton}" />
<RadioButton
x:Name="HsvRadioButton"
Name="HsvRadioButton"
Grid.Column="1"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Expand All @@ -307,7 +307,7 @@
</Grid>
</Border>
<TextBox
x:Name="PART_HexTextBox"
Name="PART_HexTextBox"
Grid.Column="2"
Height="32"
HorizontalAlignment="Stretch"
Expand All @@ -319,7 +319,7 @@
<!-- Color component editing controls -->
<!-- Component 1 RGB:Red HSV:Hue -->
<NumericUpDown
x:Name="Component1NumericUpDown"
Name="Component1NumericUpDown"
Grid.Row="2"
Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}"
Expand All @@ -334,7 +334,7 @@
ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component1Slider}" />
<primitives:ColorSlider
x:Name="Component1Slider"
Name="Component1Slider"
Grid.Row="2"
Grid.Column="1"
HorizontalAlignment="Stretch"
Expand All @@ -350,7 +350,7 @@
TickFrequency="1" />
<!-- Component 2 RGB:Green HSV:Saturation -->
<NumericUpDown
x:Name="Component2NumericUpDown"
Name="Component2NumericUpDown"
Grid.Row="3"
Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}"
Expand All @@ -365,7 +365,7 @@
ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component2Slider}" />
<primitives:ColorSlider
x:Name="Component2Slider"
Name="Component2Slider"
Grid.Row="3"
Grid.Column="1"
HorizontalAlignment="Stretch"
Expand All @@ -381,7 +381,7 @@
TickFrequency="1" />
<!-- Component 3 RGB:Blue HSV:Value -->
<NumericUpDown
x:Name="Component3NumericUpDown"
Name="Component3NumericUpDown"
Grid.Row="4"
Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}"
Expand All @@ -396,7 +396,7 @@
ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component3Slider}" />
<primitives:ColorSlider
x:Name="Component3Slider"
Name="Component3Slider"
Grid.Row="4"
Grid.Column="1"
HorizontalAlignment="Stretch"
Expand All @@ -412,7 +412,7 @@
TickFrequency="1" />
<!-- Alpha Component -->
<NumericUpDown
x:Name="AlphaComponentNumericUpDown"
Name="AlphaComponentNumericUpDown"
Grid.Row="5"
Grid.Column="0"
Width="{DynamicResource ColorViewNumericUpDownWidth}"
Expand All @@ -434,7 +434,7 @@
</NumericUpDown.IsVisible>
</NumericUpDown>
<primitives:ColorSlider
x:Name="AlphaComponentSlider"
Name="AlphaComponentSlider"
Grid.Row="5"
Grid.Column="1"
HorizontalAlignment="Stretch"
Expand Down Expand Up @@ -559,7 +559,7 @@
CornerRadius="8 8 0 0"
ClipToBounds="True">
<primitives:ColorSpectrum
x:Name="ColorSpectrum"
Name="ColorSpectrum"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Components="{TemplateBinding ColorSpectrumComponents}"
Expand All @@ -573,7 +573,7 @@
Shape="{TemplateBinding ColorSpectrumShape}" />
</Border>
<primitives:ColorSlider
x:Name="ColorSpectrumThirdComponentSlider"
Name="ColorSpectrumThirdComponentSlider"
Grid.Row="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Expand All @@ -585,7 +585,7 @@
Orientation="Horizontal" />

<primitives:ColorSlider
x:Name="ColorSpectrumAlphaSlider"
Name="ColorSpectrumAlphaSlider"
Grid.Row="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Expand All @@ -612,32 +612,32 @@
Height="20"
CornerRadius="4" />
<Panel
x:Name="PART_TextBoxPanel"
Name="PART_TextBoxPanel"
Width="106"
Margin="4 0 0 0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center">
<TextBox
x:Name="PART_HexTextBox"
Name="PART_HexTextBox"
Classes="Small"
InnerLeftContent="#"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hex}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToHexConverter}, Mode=TwoWay}"
MaxLength="8" />
<TextBox
x:Name="PART_RgbaTextBox"
Name="PART_RgbaTextBox"
Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Rgba}"
Text="{TemplateBinding Color, Converter={StaticResource ColorToTextConverter}, Mode=TwoWay}" />
<TextBox
x:Name="PART_HsvaTextBox"
Name="PART_HsvaTextBox"
Classes="Small"
IsVisible="{Binding #ColorModelComboBox.SelectedValue, Converter={StaticResource ToColorModel}, ConverterParameter=Hsva}"
Text="{TemplateBinding HsvColor, Converter={StaticResource HsvColorToTextConverter}, Mode=TwoWay}" />
</Panel>

<NumericUpDown
x:Name="AlphaComponentNumericUpDown"
Name="AlphaComponentNumericUpDown"
Width="70"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Expand All @@ -652,7 +652,7 @@
IsVisible="{TemplateBinding IsAlphaVisible}"
Value="{Binding #ColorSpectrumAlphaSlider.Value}" />
<ComboBox
x:Name="ColorModelComboBox"
Name="ColorModelComboBox"
Width="80"
VerticalAlignment="Center"
Classes="Small"
Expand Down
8 changes: 4 additions & 4 deletions src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
VerticalAlignment="Stretch"
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
<Border
x:Name="PART_AccentDecrement2Border"
Name="PART_AccentDecrement2Border"
Grid.Column="0"
Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter},
Expand All @@ -39,7 +39,7 @@
Converter={StaticResource LeftCornerRadiusFilterConverter}}"
Tag="-2" />
<Border
x:Name="PART_AccentDecrement1Border"
Name="PART_AccentDecrement1Border"
Grid.Column="1"
Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter},
Expand All @@ -60,14 +60,14 @@
VerticalAlignment="Stretch"
Background="{DynamicResource ColorControlCheckeredBackgroundBrush}" />
<Border
x:Name="PART_AccentIncrement1Border"
Name="PART_AccentIncrement1Border"
Grid.Column="0"
Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter},
ConverterParameter='1'}"
Tag="1" />
<Border
x:Name="PART_AccentIncrement2Border"
Name="PART_AccentIncrement2Border"
Grid.Column="1"
Background="{TemplateBinding HsvColor,
Converter={StaticResource AccentColorConverter},
Expand Down
Loading

0 comments on commit 90dfa3b

Please sign in to comment.