From e16c7408f12e6455cb82682d2742f569e549b528 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 16 Dec 2022 12:31:52 +0800
Subject: [PATCH] feat: add TextBox Demo, fix RadioButton demo. Add Borderless
 Theme.

---
 src/Semi.Avalonia.Demo/Pages/Overview.axaml   |  8 ++-
 .../Pages/RadioButtonDemo.axaml               |  4 +-
 .../Pages/TextBoxDemo.axaml                   |  4 ++
 src/Semi.Avalonia.Demo/Program.cs             | 11 ++++
 src/Semi.Avalonia/Controls/TextBox.axaml      | 50 +++++++++++++++----
 src/Semi.Avalonia/Themes/Base.axaml           |  2 +-
 src/Semi.Avalonia/Themes/Light/TextBox.axaml  |  7 ++-
 7 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/src/Semi.Avalonia.Demo/Pages/Overview.axaml b/src/Semi.Avalonia.Demo/Pages/Overview.axaml
index 3b12151..7b15fd4 100644
--- a/src/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/src/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -3,7 +3,7 @@
     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">
-    <ScrollViewer>
+    <ScrollViewer HorizontalScrollBarVisibility="Auto">
         <StackPanel Margin="10" Spacing="5">
             <TextBlock
                 HorizontalAlignment="Center" Classes="H4"
@@ -102,6 +102,12 @@
                     <TextBlock>Shadow</TextBlock>
                 </Border>
             </Grid>
+            <StackPanel Spacing="20">
+                <TextBox InnerLeftContent="http://" InnerRightContent=".com" />
+                <TextBox
+                    Classes="revealPasswordButton" PasswordChar="*"
+                    Text="Avalonia" />
+            </StackPanel>
         </StackPanel>
     </ScrollViewer>
 </UserControl>
diff --git a/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml b/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
index 9c4a440..bb655cd 100644
--- a/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
+++ b/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
@@ -14,8 +14,8 @@
         <TextBlock Text="Radio Button as Button" />
         <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
             <StackPanel Orientation="Horizontal">
-                <RadioButton Classes="Small" >小1</RadioButton>
-                <RadioButton Classes="Small" >小2</RadioButton>
+                <RadioButton Classes="Small" Theme="{DynamicResource ButtonRadioButton}">小1</RadioButton>
+                <RadioButton Classes="Small" Theme="{DynamicResource ButtonRadioButton}">小2</RadioButton>
             </StackPanel>
         </Border>
         <Border HorizontalAlignment="Left" Theme="{StaticResource RadioButtonGroupBorder}">
diff --git a/src/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml b/src/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
index bdfe40a..f8169ae 100644
--- a/src/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/src/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -17,6 +17,10 @@
             <TextBox
                 Width="300" Classes="revealPasswordButton"
                 PasswordChar="*" />
+            <TextBox
+                Width="500" InnerLeftContent="http://"
+                InnerRightContent=".com"
+                Theme="{StaticResource BorderlessTextBox}" />
         </StackPanel>
     </ScrollViewer>
 </UserControl>
diff --git a/src/Semi.Avalonia.Demo/Program.cs b/src/Semi.Avalonia.Demo/Program.cs
index afe35b2..77b86bd 100644
--- a/src/Semi.Avalonia.Demo/Program.cs
+++ b/src/Semi.Avalonia.Demo/Program.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using System;
+using Avalonia.Media;
 
 namespace Semi.Avalonia.Demo
 {
@@ -10,6 +11,16 @@ namespace Semi.Avalonia.Demo
         // yet and stuff might break.
         [STAThread]
         public static void Main(string[] args) => BuildAvaloniaApp()
+            .With(new FontManagerOptions
+            {
+                FontFallbacks = new[]
+                {
+                    new FontFallback
+                    {
+                        FontFamily = new FontFamily("Microsoft YaHei")
+                    }
+                }
+            })
             .StartWithClassicDesktopLifetime(args);
 
         // Avalonia configuration, don't remove; also used by visual designer.
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 386b4e5..22905a9 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -1,7 +1,17 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <StackPanel Margin="20" Spacing="20">
-            <TextBox Classes="clearButton" Text="Hello" />
+        <StackPanel
+            Width="200" Margin="20"
+            Spacing="20">
+            <TextBox
+                Classes="clearButton" Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
+            <TextBox
+                Classes="Large" Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
+            <TextBox
+                Classes="Small" Text="Hello"
+                Theme="{StaticResource BorderlessTextBox}" />
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
@@ -51,7 +61,7 @@
         <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
         <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.BorderThickness" Value="1" />
+        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
         <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="TextBox.FontSize" Value="14" />
         <Setter Property="TextBox.Cursor" Value="IBeam" />
@@ -64,6 +74,7 @@
             <ControlTemplate TargetType="TextBox">
                 <Border
                     Name="PART_ContentPresenterBorder"
+                    Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
@@ -135,15 +146,13 @@
         <Style Selector="^:disabled">
             <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
             <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            <Style Selector="^/template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Border.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
-            </Style>
+            <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
         </Style>
-        <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxPointerOverBorderBrush}" />
+        <Style Selector="^:pointerover">
+            <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxPointerOverBorderBrush}" />
         </Style>
-        <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+        <Style Selector="^:focus">
+            <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^.clearButton">
             <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
@@ -158,5 +167,26 @@
                 <Setter Property="ToggleButton.IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.Large">
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxLargeHeight}" />
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxSmallHeight}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme
+        x:Key="BorderlessTextBox"
+        BasedOn="{StaticResource {x:Type TextBox}}"
+        TargetType="TextBox">
+        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderlessDefaultBackground}" />
+        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxBorderlessDefaultBorderBrush}" />
+        <Style Selector="^:pointerover">
+            <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderlessPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:focus">
+            <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxBorderlessPointeroverBackground}" />
+            <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml
index d7bf344..e3c2410 100644
--- a/src/Semi.Avalonia/Themes/Base.axaml
+++ b/src/Semi.Avalonia/Themes/Base.axaml
@@ -3,6 +3,6 @@
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
     <!--  Add Resources Here  -->
     <sys:Double x:Key="DefaultFontSize">14</sys:Double>
-    <FontFamily x:Key="DefaultFontFamily">Inter,-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
+    <FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
     <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/TextBox.axaml b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
index 1bd53ec..a8e8f9b 100644
--- a/src/Semi.Avalonia/Themes/Light/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TextBox.axaml
@@ -2,7 +2,7 @@
     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="TextBoxDefaultBorderBrush" Color="#C6CACD" />
-    <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TextBoxDefaultBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TextBoxFocusBackground" Opacity="0.05" Color="#E6E8EA" />
     <SolidColorBrush x:Key="TextBoxPointerOverBorderBrush" Color="#0062D6" />
     <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="#004FB3" />
@@ -17,6 +17,10 @@
     <SolidColorBrush x:Key="TextBoxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
     <SolidColorBrush x:Key="TextBoxDisabledBorderBrush" Color="#E6E8EA" />
 
+    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBoxBorderlessDefaultBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TextBoxBorderlessPointeroverBackground" Opacity="0.09" Color="#2E3238" />
+
     <sys:Double x:Key="TextBoxDefaultHeight">30</sys:Double>
     <sys:Double x:Key="TextBoxSmallHeight">22</sys:Double>
     <sys:Double x:Key="TextBoxLargeHeight">38</sys:Double>
@@ -34,6 +38,7 @@
 
     <Thickness x:Key="TextBoxInnerContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
+    <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
 
     <SolidColorBrush x:Key="TextBoxSelectionBackground" Color="#0059D6" />
     <SolidColorBrush x:Key="TextBoxSelectionForeground" Color="White" />