zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Update according to feedback.

Browse Source
This commit is contained in:
rabbitism 2023-02-08 11:43:30 +08:00
parent ed8a36450e
commit 21a4ad56ea
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
View File

@ -29,7 +29,7 @@
Width="6*" Width="6*"
x:DataType="local:Country" x:DataType="local:Country"
Binding="{Binding Name}" Binding="{Binding Name}"
Header="Country" /> Header="Country or Region" />
<DataGridTextColumn <DataGridTextColumn
Width="4*" Width="4*"
x:DataType="local:Country" x:DataType="local:Country"
@ -81,7 +81,7 @@
Width="6*" Width="6*"
x:DataType="local:Country" x:DataType="local:Country"
Binding="{Binding Name}" Binding="{Binding Name}"
Header="Country" /> Header="Country or Region" />
<DataGridTextColumn <DataGridTextColumn
Width="4*" Width="4*"
x:DataType="local:Country" x:DataType="local:Country"

43
src/Semi.Avalonia.DataGrid/DataGrid.axaml
View File

@ -13,7 +13,6 @@
BasedOn="{StaticResource {x:Type TextBox}}" BasedOn="{StaticResource {x:Type TextBox}}"
TargetType="TextBox"> TargetType="TextBox">
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="Background" Value="Transparent" />
<Style Selector="^ /template/ DataValidationErrors"> <Style Selector="^ /template/ DataValidationErrors">
<Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" /> <Setter Property="Theme" Value="{DynamicResource TooltipDataValidationErrors}" />
</Style> </Style>
@ -116,13 +115,18 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto"> <Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
<Border
Name="HeaderBackground"
Grid.ColumnSpan="2"
Margin="4"
CornerRadius="3" />
<Grid <Grid
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"> VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" MinWidth="32" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" /> <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
<PathIcon <PathIcon
@ -130,6 +134,7 @@
Grid.Column="1" Grid.Column="1"
Width="8" Width="8"
Height="8" Height="8"
Margin="0,0,8,0"
Foreground="{TemplateBinding Foreground}" /> Foreground="{TemplateBinding Foreground}" />
</Grid> </Grid>
<Rectangle <Rectangle
@ -162,11 +167,11 @@
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
<Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot"> <Style Selector="^:pointerover /template/ Border#HeaderBackground">
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPointeroverBackground}" />
</Style> </Style>
<Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot"> <Style Selector="^:pressed /template/ Border#HeaderBackground">
<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackground}" />
</Style> </Style>
@ -275,11 +280,13 @@
ColumnDefinitions="Auto,*" ColumnDefinitions="Auto,*"
RowDefinitions="*,Auto,Auto"> RowDefinitions="*,Auto,Auto">
<Rectangle <Border
Name="BackgroundRectangle" Name="BackgroundBorder"
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Fill="{DynamicResource DataGridRowBackground}" /> Margin="2"
Background="{DynamicResource DataGridRowBackground}"
CornerRadius="3" />
<Rectangle <Rectangle
x:Name="InvalidVisualElement" x:Name="InvalidVisualElement"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
@ -314,27 +321,27 @@
<Style Selector="^ /template/ Rectangle#InvalidVisualElement"> <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
<Setter Property="Opacity" Value="0.4" /> <Setter Property="Opacity" Value="0.4" />
</Style> </Style>
<Style Selector="^ /template/ Rectangle#BackgroundRectangle"> <Style Selector="^ /template/ Border#BackgroundBorder">
<Setter Property="Opacity" Value="0" /> <Setter Property="Opacity" Value="0" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle"> <Style Selector="^:pointerover /template/ Border#BackgroundBorder">
<Setter Property="Fill" Value="{DynamicResource DataGridRowPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowPointeroverBackground}" />
</Style> </Style>
<Style Selector="^:selected"> <Style Selector="^:selected">
<Style Selector="^ /template/ Rectangle#BackgroundRectangle"> <Style Selector="^ /template/ Border#BackgroundBorder">
<Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowSelectedBackground}" />
</Style> </Style>
<Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle"> <Style Selector="^:pointerover /template/ Border#BackgroundBorder">
<Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowSelectedPointeroverBackground}" />
</Style> </Style>
<Style Selector="^:focus /template/ Rectangle#BackgroundRectangle"> <Style Selector="^:focus /template/ Border#BackgroundBorder">
<Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowSelectedBackground}" />
</Style> </Style>
<Style Selector="^:pointerover:focus /template/ Rectangle#BackgroundRectangle"> <Style Selector="^:pointerover:focus /template/ Border#BackgroundBorder">
<Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowSelectedPointeroverBackground}" />
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>