zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-05-02 05:51:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: replace shared resources.

Browse Source
This commit is contained in:
Zhang Dian
2025-03-15 17:45:49 +08:00
parent c3c6ef629f
commit f4c0e0d79a
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@
Name="HeaderBackground" Name="HeaderBackground"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="4" Margin="4"
CornerRadius="3" /> CornerRadius="{DynamicResource DataGridColumnHeaderCornerRadius}" />
<Grid <Grid
ColumnDefinitions="*,Auto" ColumnDefinitions="*,Auto"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
@@ -291,7 +291,7 @@
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="{DynamicResource DataGridRowMargin}" Margin="{DynamicResource DataGridRowMargin}"
Background="{DynamicResource DataGridRowBackground}" Background="{DynamicResource DataGridRowBackground}"
CornerRadius="3" /> CornerRadius="{DynamicResource DataGridRowCornerRadius}" />
<Rectangle <Rectangle
Name="InvalidVisualElement" Name="InvalidVisualElement"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
@@ -372,7 +372,7 @@
<ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader"> <ControlTheme x:Key="{x:Type DataGridRowGroupHeader}" TargetType="DataGridRowGroupHeader">
<Setter Property="Focusable" Value="False" /> <Setter Property="Focusable" Value="False" />
<Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackground}" /> <Setter Property="Background" Value="{DynamicResource DataGridRowGroupHeaderBackground}" />
<Setter Property="MinHeight" Value="32" /> <Setter Property="MinHeight" Value="{DynamicResource DataGridRowGroupHeaderMinHeight}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate x:DataType="collections:DataGridCollectionViewGroup" TargetType="DataGridRowGroupHeader"> <ControlTemplate x:DataType="collections:DataGridCollectionViewGroup" TargetType="DataGridRowGroupHeader">
<DataGridFrozenGrid <DataGridFrozenGrid
@@ -549,7 +549,7 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource DataGridDisabledBackground}" Background="{DynamicResource DataGridDisabledBackground}"
CornerRadius="2" CornerRadius="{DynamicResource DataGridDisabledCornerRadius}"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="{Binding !$parent[DataGrid].IsEnabled}" /> IsVisible="{Binding !$parent[DataGrid].IsEnabled}" />
</Grid> </Grid>

18
src/Semi.Avalonia.DataGrid/Shared.axaml
View File

@@ -1,20 +1,22 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Thickness x:Key="DataGridCellTextBlockDefaultMargin">12 0</Thickness> <Thickness x:Key="DataGridCellTextBlockDefaultMargin">12 0</Thickness>
<StaticResource x:Key="DataGridCellMinHeight" ResourceKey="SemiHeightControlDefault" />
<x:Double x:Key="DataGridCellMinHeight">32</x:Double> <StaticResource x:Key="DataGridCellVisualBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<Thickness x:Key="DataGridCellVisualBorderThickness">1</Thickness> <StaticResource x:Key="DataGridCellVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />
<x:Double x:Key="DataGridCellVisualStrokeThickness">1</x:Double>
<Thickness x:Key="DataGridColumnHeaderPadding">12 0 0 0</Thickness> <Thickness x:Key="DataGridColumnHeaderPadding">12 0 0 0</Thickness>
<x:Double x:Key="DataGridColumnHeaderMinHeight">32</x:Double> <StaticResource x:Key="DataGridColumnHeaderMinHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="DataGridColumnHeaderCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="DataGridColumnHeaderAscendingGlyph" ResourceKey="SemiIconSmallTriangleTop" /> <StaticResource x:Key="DataGridColumnHeaderAscendingGlyph" ResourceKey="SemiIconSmallTriangleTop" />
<StaticResource x:Key="DataGridColumnHeaderDescendingGlyph" ResourceKey="SemiIconSmallTriangleDown" /> <StaticResource x:Key="DataGridColumnHeaderDescendingGlyph" ResourceKey="SemiIconSmallTriangleDown" />
<Thickness x:Key="DataGridRowHeaderMargin">8 0</Thickness> <Thickness x:Key="DataGridRowHeaderMargin">8 0</Thickness>
<Thickness x:Key="DataGridRowMargin">2</Thickness> <StaticResource x:Key="DataGridRowCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="DataGridRowMargin" ResourceKey="SemiThicknessSuperTight" />
<StaticResource x:Key="DataGridRowGroupHeaderMinHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="DataGridRowGroupHeaderExpandIconGlyph" ResourceKey="SemiIconChevronRight" /> <StaticResource x:Key="DataGridRowGroupHeaderExpandIconGlyph" ResourceKey="SemiIconChevronRight" />
<StaticResource x:Key="DataGridRowGroupHeaderVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />
<x:Double x:Key="DataGridRowGroupHeaderVisualStrokeThickness">1</x:Double> <StaticResource x:Key="DataGridDisabledCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
</ResourceDictionary> </ResourceDictionary>