feat(theme): use generic theme

giard-alexandre · May 9, 2024 · 61d7324 · 61d7324
1 parent 9f5cce9
commit 61d7324
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.2" />
+    <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.10" />

diff --git a/samples/SampleApp/App.axaml b/samples/SampleApp/App.axaml
@@ -6,7 +6,6 @@
 
     <Application.Styles>
         <FluentTheme />
-        <!-- <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/> -->
         <StyleInclude Source="avares://DynamicTreeDataGrid/Themes/Generic.axaml"/>
 
     </Application.Styles>

diff --git a/src/DynamicTreeDataGrid/Themes/Generic.axaml b/src/DynamicTreeDataGrid/Themes/Generic.axaml
@@ -11,9 +11,7 @@
 		</Border>
 	</Design.PreviewWith>
 
-	<!-- TODO: Use the Generic style once it's exposed. -->
-	<!-- <StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Generic.axaml"/> -->
-	<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml" />
+	<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Generic.axaml"/>
 
 	<Style Selector="FlyoutPresenter.NoPadding">
 		<Setter Property="Padding" Value="0" />