zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-03-20 00:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: rearrange demo theme resources.

Browse Source
This commit is contained in:
Zhang Dian
2024-12-31 13:20:23 +08:00
parent c44b9a0173
commit ef8531d25d
9 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
demo/Semi.Avalonia.Demo/App.axaml
View File

@@ -7,8 +7,15 @@
<!-- You can still reference in old way. -->
<!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
<semi:SemiTheme Locale="zh-CN" />
<semi:SemiPopupAnimations/>
<semi:SemiPopupAnimations />
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
</Application.Styles>
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="Themes/_index.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

9
demo/Semi.Avalonia.Demo/Pages/HighContrastDemo.axaml
View File

@@ -11,15 +11,6 @@
<Design.DataContext>
<vm:HighContrastDemoViewModel />
</Design.DataContext>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
<ResourceInclude Source="../Controls/ColorItemControl.axaml" />
<ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<SplitView
Name="splitView"
CompactPaneLength="50"

11
demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
View File

@@ -14,17 +14,6 @@
<Design.DataContext>
<viewModels:PaletteDemoViewModel />
</Design.DataContext>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
<ResourceInclude Source="../Controls/ColorItemControl.axaml" />
<ResourceInclude Source="../Controls/ColorDetailControl.axaml" />
<ResourceInclude Source="../Controls/FunctionalColorGroupControl.axaml" />
<ResourceInclude Source="../Controls/ShadowGroupControl.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<SplitView
Name="splitView"
CompactPaneLength="50"

0
demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml → demo/Semi.Avalonia.Demo/Themes/ColorDetailControl.axaml
View File

0
demo/Semi.Avalonia.Demo/Controls/ColorItemControl.axaml → demo/Semi.Avalonia.Demo/Themes/ColorItemControl.axaml
View File

0
demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml → demo/Semi.Avalonia.Demo/Themes/FunctionalColorGroupControl.axaml
View File

0
demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml → demo/Semi.Avalonia.Demo/Themes/ShadowGroupControl.axaml
View File

10
demo/Semi.Avalonia.Demo/Themes/_index.axaml Normal file
View File

@@ -0,0 +1,10 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="ColorDetailControl.axaml" />
<ResourceInclude Source="ColorItemControl.axaml" />
<ResourceInclude Source="FunctionalColorGroupControl.axaml" />
<ResourceInclude Source="ShadowGroupControl.axaml" />
<ResourceInclude Source="TabMenu.axaml" />
<ResourceInclude Source="ToggleSwitch.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

8
demo/Semi.Avalonia.Demo/Views/MainView.axaml
View File

@@ -11,14 +11,6 @@
x:CompileBindings="True"
x:DataType="views:MainViewModel"
mc:Ignorable="d">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="../Themes/TabMenu.axaml" />
<ResourceInclude Source="../Themes/ToggleSwitch.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid RowDefinitions="Auto, *">
<Border
Grid.Row="0"