From f55ead465ca385771b9e9d6659399d4a5aaea064 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 11 Dec 2022 12:17:52 +0800
Subject: [PATCH] feat: implement CardBorder.

---
 src/Semi.Avalonia.Demo/MainWindow.axaml       |  3 ++
 src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml | 17 +++++++++
 .../Pages/BorderDemo.axaml.cs                 | 18 ++++++++++
 src/Semi.Avalonia.Demo/Program.cs             |  2 +-
 src/Semi.Avalonia/Controls/Border.axaml       | 36 +++++++++++++++++++
 src/Semi.Avalonia/Controls/Controls.axaml     |  1 +
 src/Semi.Avalonia/Controls/Label.axaml        |  2 +-
 src/Semi.Avalonia/Controls/RadioButton.axaml  |  6 ----
 src/Semi.Avalonia/Themes/Light/Border.axaml   | 10 ++++++
 src/Semi.Avalonia/Themes/Light/Light.axaml    |  1 +
 10 files changed, 88 insertions(+), 8 deletions(-)
 create mode 100644 src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
 create mode 100644 src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
 create mode 100644 src/Semi.Avalonia/Controls/Border.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Light/Border.axaml

diff --git a/src/Semi.Avalonia.Demo/MainWindow.axaml b/src/Semi.Avalonia.Demo/MainWindow.axaml
index 44476e5..ba4ea16 100644
--- a/src/Semi.Avalonia.Demo/MainWindow.axaml
+++ b/src/Semi.Avalonia.Demo/MainWindow.axaml
@@ -20,5 +20,8 @@
         <TabItem Header="Label">
             <pages:LabelDemo />
         </TabItem>
+        <TabItem Header="Border">
+            <pages:BorderDemo />
+        </TabItem>
     </TabControl>
 </Window>
diff --git a/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml b/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
new file mode 100644
index 0000000..04442d8
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
@@ -0,0 +1,17 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.BorderDemo" xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450"
+    d:DesignWidth="800" mc:Ignorable="d">
+    <StackPanel Margin="20" Spacing="20">
+        <Border Theme="{StaticResource CardBorder}">
+            <TextBlock>Card</TextBlock>
+        </Border>
+        <Border Classes="Shadow" Theme="{StaticResource CardBorder}">
+            <TextBlock>Shadow Always Applied</TextBlock>
+        </Border>
+        <Border Classes="Hover" Theme="{StaticResource CardBorder}">
+            <TextBlock>Shadow on Pointerover</TextBlock>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs b/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
new file mode 100644
index 0000000..476c880
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/BorderDemo.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class BorderDemo : UserControl
+{
+    public BorderDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia.Demo/Program.cs b/src/Semi.Avalonia.Demo/Program.cs
index 025b4f1..afe35b2 100644
--- a/src/Semi.Avalonia.Demo/Program.cs
+++ b/src/Semi.Avalonia.Demo/Program.cs
@@ -16,7 +16,7 @@ namespace Semi.Avalonia.Demo
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .With(new Win32PlatformOptions(){ UseCompositor = false})
+                .With(new Win32PlatformOptions(){ UseCompositor = true})
                 .LogToTrace();
     }
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Border.axaml b/src/Semi.Avalonia/Controls/Border.axaml
new file mode 100644
index 0000000..6d56000
--- /dev/null
+++ b/src/Semi.Avalonia/Controls/Border.axaml
@@ -0,0 +1,36 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <StackPanel Margin="20" Spacing="20">
+            <Border Theme="{StaticResource CardBorder}">
+                <TextBlock>Hello</TextBlock>
+            </Border>
+            <Border Classes="Shadow" Theme="{StaticResource CardBorder}">
+                <TextBlock>Hello</TextBlock>
+            </Border>
+            <Border Classes="Hover" Theme="{StaticResource CardBorder}">
+                <TextBlock>Hello</TextBlock>
+            </Border>
+        </StackPanel>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="RadioButtonGroupBorder" TargetType="Border">
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource RadioButtonGroupCornerRadius}" />
+        <Setter Property="Border.Background" Value="{DynamicResource RadioButtonGroupBackground}" />
+    </ControlTheme>
+
+    <ControlTheme x:Key="CardBorder" TargetType="Border">
+        <Setter Property="Border.Padding" Value="{DynamicResource ThicknessCardPadding}" />
+        <Setter Property="Border.BorderBrush" Value="{DynamicResource BorderCardBorderBrush}" />
+        <Setter Property="Border.CornerRadius" Value="{DynamicResource RadiusCardCornerRadius}" />
+        <Setter Property="Border.Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="Border.BorderThickness" Value="{DynamicResource ThicknessCardBorderThickness}" />
+        <Setter Property="Border.Margin" Value="{DynamicResource ThicknessCardMargin}" />
+        <Style Selector="^.Shadow">
+            <Setter Property="Border.BoxShadow" Value="0 0 14 #1A000000" />
+        </Style>
+        <Style Selector="^.Hover:pointerover">
+            <Setter Property="Border.BoxShadow" Value="0 0 14 #1A000000" />
+        </Style>
+
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml
index e805b53..9846461 100644
--- a/src/Semi.Avalonia/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/Controls.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Button.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml
index cc3e0aa..bae693e 100644
--- a/src/Semi.Avalonia/Controls/Label.axaml
+++ b/src/Semi.Avalonia/Controls/Label.axaml
@@ -183,7 +183,7 @@
                     ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     FontSize="{TemplateBinding FontSize}"
-                    RecognizesAccessKey="True" />
+                    RecognizesAccessKey="True" UseLayoutRounding="True" />
             </ControlTemplate>
         </Setter>
         <Style Selector="^.Large">
diff --git a/src/Semi.Avalonia/Controls/RadioButton.axaml b/src/Semi.Avalonia/Controls/RadioButton.axaml
index 49ba2dc..be40ad5 100644
--- a/src/Semi.Avalonia/Controls/RadioButton.axaml
+++ b/src/Semi.Avalonia/Controls/RadioButton.axaml
@@ -129,12 +129,6 @@
         </Style>
     </ControlTheme>
 
-    <ControlTheme x:Key="RadioButtonGroupBorder" TargetType="Border">
-        <Setter Property="Border.CornerRadius" Value="{DynamicResource RadioButtonGroupCornerRadius}" />
-        <Setter Property="Border.Background" Value="{DynamicResource RadioButtonGroupBackground}" />
-    </ControlTheme>
-
-
     <ControlTheme x:Key="ButtonRadioButton" TargetType="RadioButton">
         <Setter Property="RadioButton.CornerRadius" Value="{DynamicResource RadioButtonButtonCornerRadius}" />
         <Setter Property="RadioButton.Margin" Value="2" />
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
new file mode 100644
index 0000000..1f3a45c
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="BorderCardBackground">White</SolidColorBrush>
+    <SolidColorBrush x:Key="BorderCardBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
+    <Thickness x:Key="ThicknessCardPadding">20</Thickness>
+    <Thickness x:Key="ThicknessCardMargin">4</Thickness>
+    <Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml
index 478588e..3b32fa9 100644
--- a/src/Semi.Avalonia/Themes/Light/Light.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -2,6 +2,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Palette.axaml" />
         <!--  Controls  -->
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Button.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Label.axaml" />