From dd3c4bdbaeda52116a5d5e3868b1002103a03b2e Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:35:39 +0800
Subject: [PATCH 1/2] feat: remove default implementation of ContentControl and
 UserControl.

---
 .../Controls/ContentControl.axaml             | 22 ------------------
 src/Semi.Avalonia/Controls/UserControl.axaml  | 23 -------------------
 src/Semi.Avalonia/Controls/_index.axaml       |  2 --
 3 files changed, 47 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Controls/ContentControl.axaml
 delete mode 100644 src/Semi.Avalonia/Controls/UserControl.axaml

diff --git a/src/Semi.Avalonia/Controls/ContentControl.axaml b/src/Semi.Avalonia/Controls/ContentControl.axaml
deleted file mode 100644
index f19aed7..0000000
--- a/src/Semi.Avalonia/Controls/ContentControl.axaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="ContentControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/UserControl.axaml b/src/Semi.Avalonia/Controls/UserControl.axaml
deleted file mode 100644
index 4d799f2..0000000
--- a/src/Semi.Avalonia/Controls/UserControl.axaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-    <ControlTheme x:Key="{x:Type UserControl}" TargetType="UserControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="UserControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/_index.axaml b/src/Semi.Avalonia/Controls/_index.axaml
index 7858a19..2ae7781 100644
--- 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>

From dad406e995ed8f8308f777a9f5b32af2259b765e Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 15 Mar 2024 23:07:04 +0800
Subject: [PATCH 2/2] feat: remove usercontrol inheritance style.

---
 src/Semi.Avalonia/Themes/DarkTheme.axaml  | 3 ---
 src/Semi.Avalonia/Themes/Index.axaml      | 3 ---
 src/Semi.Avalonia/Themes/LightTheme.axaml | 3 ---
 src/Semi.Avalonia/Themes/SemiTheme.axaml  | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
index c4ee2ae..393d404 100644
--- 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>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Themes/Index.axaml
index 701f381..5af2035 100644
--- 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
index 00dced9..aeae5cc 100644
--- 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>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
index 1b36b00..5e86cb3 100644
--- 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>