fix: Address review

AvaloniaUI · Nov 16, 2023 · 9c57e43 · 9c57e43
1 parent 43b4664
commit 9c57e43
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 39 deletions.
diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,38 +1,36 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>
-
-    <StackPanel Width="400" MinHeight="400">
+  <Design.PreviewWith>    
+    <StackPanel Width="400" Spacing="10">      
        <ThemeVariantScope RequestedThemeVariant="Default">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Light">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Dark">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
     </StackPanel>
   </Design.PreviewWith>
 
-  <ResourceDictionary.ThemeDictionaries>
-      <ResourceDictionary x:Key="Default">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Light">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Dark">
-        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
-      </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-
+ <!--
+   If you want support Theme variant see 
+   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+ -->
+
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
         <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
       </ControlTemplate>
     </Setter>
   </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
@@ -4,6 +4,4 @@ namespace AvaloniaAppTemplate.Namespace;
 
 public class NewTemplatedControl : TemplatedControl
 {
-    protected override Type StyleKeyOverride => 
-        typeof(Avalonia.Labs.Controls.ContentDialog);
 }
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -2,31 +2,30 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
   <Design.PreviewWith>    
-    <StackPanel Width="400" MinHeight="400">
+    <StackPanel Width="400" Spacing="10">      
        <ThemeVariantScope RequestedThemeVariant="Default">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Light">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
        <ThemeVariantScope RequestedThemeVariant="Dark">
-          <controls:NewTemplatedControl />      
+          <StackPanel Background="{DynamicResource SystemRegionBrush}">
+            <controls:NewTemplatedControl />
+          </StackPanel>
        </ThemeVariantScope>
     </StackPanel>
   </Design.PreviewWith>
 
-  <ResourceDictionary.ThemeDictionaries>
-      <ResourceDictionary x:Key="Default">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Light">
-        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
-      </ResourceDictionary>
-      <ResourceDictionary x:Key="Dark">
-        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
-      </ResourceDictionary>
-  </ResourceDictionary.ThemeDictionaries>
-
+ <!--
+   If you want support Theme variant see 
+   https://github.com/AvaloniaUI/Avalonia.Samples/tree/main/src/Avalonia.Samples/CustomControls/RatingControlSample#step-9-theme-variant
+ -->
+
   <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>

diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
@@ -4,5 +4,4 @@ open Avalonia.Controls.Primitives
 
 type NewTemplatedControl () = 
     inherit TemplatedControl ()
-        override StyleKeyOverride
-            with get() = typedefof<NewTemplatedControl>
+