配色更新

This commit is contained in:
GG Z
2025-08-26 21:33:20 +08:00
parent ce4cc7bed0
commit e5f139264e
47 changed files with 432 additions and 606 deletions

View File

@@ -13,7 +13,7 @@
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/LightBlue.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/DarkBlue.xaml"/>
<ResourceDictionary Source="pack://application:,,,/NeuWPF;component/Themes/Dark.xaml" />-->
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Dark.xaml" />-->
<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

View File

@@ -191,13 +191,11 @@
Grid.Row="0"
Grid.Column="2"
Margin="5"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Content="卡片"
CornerRadius="16"
FontSize="24"
Foreground="{DynamicResource PrimaryGradientBrush}" />
<n:LightedSurface
Grid.Row="1"
Grid.Column="0"
@@ -1126,7 +1124,7 @@
</TabControl>
<TabControl Style="{StaticResource NavigationTabControl}" TabStripPlacement="Bottom">
<TabItem Header="选项卡 1">
<Grid Margin="4">
<Grid>
<!-- <Separator /> -->
<DataGrid
Margin="4"
@@ -1154,7 +1152,7 @@
</TabControl>
<TabControl TabStripPlacement="Left">
<TabItem Header="选项卡 1">
<Grid Margin="4">
<Grid>
<!-- <Separator /> -->
<DataGrid
Margin="4"
@@ -1196,7 +1194,8 @@
<TabItem Header="选项卡 2" />
<TabItem Header="禁用选项卡" IsEnabled="False" />
</TabControl>
<n:NeuDataGrid Margin="5"
<n:NeuDataGrid
Margin="5"
HorizontalAlignment="Left"
d:ItemsSource="{d:SampleData ItemCount=5}"
BindableSelectedItems="{Binding SelectedDataItems, Mode=TwoWay}"
@@ -1233,7 +1232,10 @@
<DataGridTextColumn Binding="{Binding Age}" Header="Age" />
</n:NeuDataGrid.Columns>
</n:NeuDataGrid>
<n:TreeGrid Margin="5" d:ItemsSource="{d:SampleData ItemCount=5}" ItemsSource="{Binding HierarchicalData}">
<n:TreeGrid
Margin="5"
d:ItemsSource="{d:SampleData ItemCount=5}"
ItemsSource="{Binding HierarchicalData}">
<n:TreeGrid.ItemTemplate>
<HierarchicalDataTemplate DataType="{x:Type neuwpftest:TreeNodeItem}" ItemsSource="{Binding Children}">
<!-- 使用 GridViewRowPresenter 来确保内容与表头列对齐 -->