Merge pull request #315 from irihitech/rc/313-content-control-template

Remove default implementation of ContentControl and UserControl
irihitech · Mar 15, 2024 · 8b4a670 · 8b4a670
2 parents 13e9364 + dad406e
commit 8b4a670
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 59 deletions.
diff --git a/src/Semi.Avalonia/Controls/ContentControl.axaml b/src/Semi.Avalonia/Controls/ContentControl.axaml
diff --git a/src/Semi.Avalonia/Controls/UserControl.axaml b/src/Semi.Avalonia/Controls/UserControl.axaml
diff --git a/src/Semi.Avalonia/Controls/_index.axaml b/src/Semi.Avalonia/Controls/_index.axaml
@@ -13,7 +13,6 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Carousel.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ComboBox.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContentControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/DataValidationErrors.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
@@ -57,7 +56,6 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Tooltip.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/TransitioningContentControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/TreeView.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/UserControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
     </ResourceDictionary.MergedDictionaries>

diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
@@ -8,7 +8,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Themes/Index.axaml
@@ -13,7 +13,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>
diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
@@ -8,7 +8,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{StaticResource {x:Type UserControl}}" />
-    </Style>
 </Styles>
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
@@ -13,7 +13,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>