Add ControlTheme for UserControl

JanTamis · Jun 5, 2023 · 7f6e3f8 · 7f6e3f8
1 parent 41f7e9b
commit 7f6e3f8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Material.Styles/MaterialToolKit.xaml b/Material.Styles/MaterialToolKit.xaml
@@ -65,6 +65,7 @@
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ProgressBar.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/Slider.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/SideSheet.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/UserControl.axaml" />
       </ResourceDictionary.MergedDictionaries>
       <SolidColorBrush x:Key="MaterialDesignLightBackground" Color="#FFFAFAFA" />
       <SolidColorBrush x:Key="MaterialDesignLightForeground" Color="#DD000000" />
@@ -152,7 +153,7 @@
 
   <!-- <StyleInclude Source="avares://Material.Styles/ToolTip.xaml" /> -->
   <!--<StyleInclude Source="avares://Material.Styles/TreeView.xaml" />-->
-  <StyleInclude Source="avares://Material.Styles/UserControl.xaml" />
+  <!-- <StyleInclude Source="avares://Material.Styles/UserControl.xaml" /> -->
   <StyleInclude Source="avares://Material.Styles/WindowNotificationManager.xaml" />
 
   <!-- Complex controls -->

diff --git a/Material.Styles/Resources/Themes/UserControl.axaml b/Material.Styles/Resources/Themes/UserControl.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type UserControl}"
+                TargetType="UserControl">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>