From 8de7a1ae8c1b782bca8d162398bc4c660a9cdcad Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:56:46 +0800
Subject: [PATCH] fix: various issues of demos.

---
 .../Pages/AutoCompleteBoxDemo.axaml           | 58 ++++++++-----
 .../Pages/NumericUpDownDemo.axaml             | 81 +++++++++----------
 .../Pages/SplitViewDemo.axaml                 |  2 +
 .../Pages/TextBoxDemo.axaml                   | 43 +++++++---
 .../Pages/ToggleButtonDemo.axaml              |  6 +-
 5 files changed, 107 insertions(+), 83 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
index 0e13eda..7fc2efb 100644
--- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
@@ -26,29 +26,7 @@
                     </DataTemplate>
                 </Setter>
             </Style>
-            <Style Selector="AutoCompleteBox.Split">
-                <Setter Property="Width" Value="100" />
-            </Style>
         </StackPanel.Styles>
-        <StackPanel Orientation="Horizontal">
-            <AutoCompleteBox Classes="Split Large"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox Classes="Split"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox Classes="Split Small"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal">
-            <AutoCompleteBox Classes="Split"
-                             IsEnabled="False"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox Classes="Split Bordered"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-            <AutoCompleteBox Classes="Split Bordered"
-                             IsEnabled="False"
-                             ValueMemberBinding="{ReflectionBinding Name}" />
-        </StackPanel>
 
         <AutoCompleteBox
             Watermark="Please select a State"
@@ -70,5 +48,41 @@
             InnerLeftContent="https://"
             InnerRightContent=".com"
             ValueMemberBinding="{ReflectionBinding Name}" />
+
+        <StackPanel Orientation="Horizontal">
+            <AutoCompleteBox
+                Width="100"
+                Classes="Large"
+                Watermark="Large"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+            <AutoCompleteBox
+                Width="100"
+                Watermark="Default"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+            <AutoCompleteBox
+                Width="100"
+                Classes="Small"
+                Watermark="Small"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+        </StackPanel>
+
+        <StackPanel Orientation="Horizontal">
+            <AutoCompleteBox
+                Width="100"
+                IsEnabled="False"
+                Watermark="Disabled"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+            <AutoCompleteBox
+                Width="100"
+                Classes="Bordered"
+                Watermark="Bordered"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+            <AutoCompleteBox
+                Width="100"
+                Classes="Bordered"
+                IsEnabled="False"
+                ValueMemberBinding="{ReflectionBinding Name}" />
+        </StackPanel>
+
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
index 64193c8..b249c23 100644
--- a/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
@@ -4,62 +4,53 @@
     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:DesignHeight="800"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel HorizontalAlignment="Left" Spacing="20">
+        <StackPanel.Styles>
+            <Style Selector="NumericUpDown">
+                <Setter Property="Width" Value="300" />
+                <Setter Property="Maximum" Value="100" />
+                <Setter Property="Minimum" Value="0" />
+            </Style>
+        </StackPanel.Styles>
+
+        <NumericUpDown />
+        <NumericUpDown Increment="10" />
+        <NumericUpDown ButtonSpinnerLocation="Left" />
+        <NumericUpDown ShowButtonSpinner="False" />
+        <NumericUpDown Classes="Large" />
+        <NumericUpDown Classes="Small" />
+        <NumericUpDown InnerLeftContent="Price" InnerRightContent="$" />
+
         <StackPanel Orientation="Horizontal">
-            <NumericUpDown Classes="Large" Width="150" ButtonSpinnerLocation="Left"/>
-            <NumericUpDown Width="150" ShowButtonSpinner="False" />
-            <NumericUpDown Classes="Small" Width="150" />
+            <NumericUpDown
+                Width="100"
+                Classes="Large"
+                Watermark="Large"
+                ButtonSpinnerLocation="Left" />
+            <NumericUpDown
+                Width="100"
+                Watermark="Default"
+                ShowButtonSpinner="False" />
+            <NumericUpDown
+                Width="100"
+                Watermark="Small"
+                Classes="Small" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal">
-            <NumericUpDown Width="150" ButtonSpinnerLocation="Left" />
-            <NumericUpDown Width="150" ShowButtonSpinner="False" />
-            <NumericUpDown Width="150" />
+            <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
+            <NumericUpDown Width="100" ShowButtonSpinner="False" />
+            <NumericUpDown Width="100" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal">
-            <NumericUpDown Width="150" ShowButtonSpinner="False" />
-            <NumericUpDown IsEnabled="False" Width="150" />
-            <NumericUpDown Width="150" ButtonSpinnerLocation="Left" />
+            <NumericUpDown Width="100" ShowButtonSpinner="False" />
+            <NumericUpDown Width="100" IsEnabled="False" />
+            <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
         </StackPanel>
 
-        <NumericUpDown
-            Width="200"
-            Maximum="100"
-            Minimum="0" />
-        <NumericUpDown
-            Width="200"
-            Increment="10"
-            Maximum="100"
-            Minimum="0" />
-        <NumericUpDown
-            Width="200"
-            ButtonSpinnerLocation="Left"
-            Maximum="100"
-            Minimum="0" />
-        <NumericUpDown
-            Width="200"
-            Maximum="100"
-            Minimum="0"
-            ShowButtonSpinner="False" />
-        <NumericUpDown
-            Width="200"
-            Classes="Large"
-            Maximum="100"
-            Minimum="0" />
-        <NumericUpDown
-            Width="200"
-            Classes="Small"
-            Maximum="100"
-            Minimum="0" />
-        <NumericUpDown
-            Width="200"
-            InnerLeftContent="Price"
-            InnerRightContent="$"
-            Maximum="100"
-            Minimum="0" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
index 38a6db3..b63b60c 100644
--- a/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
@@ -14,11 +14,13 @@
                 Orientation="Vertical"
                 Spacing="4">
                 <ToggleButton
+                    HorizontalAlignment="Stretch"
                     Name="PaneOpenButton"
                     Content="IsPaneOpen"
                     IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" />
 
                 <ToggleButton
+                    HorizontalAlignment="Stretch"
                     Name="UseLightDismissOverlayModeButton"
                     Content="UseLightDismissOverlayMode"
                     IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" />
diff --git a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
index e5af706..e8dc197 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
@@ -5,23 +5,11 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:system="clr-namespace:System;assembly=netstandard"
-    d:DesignHeight="450"
+    d:DesignHeight="800"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <ScrollViewer>
         <StackPanel HorizontalAlignment="Left" Spacing="20">
-            <StackPanel Orientation="Horizontal">
-                <TextBox Classes="Large" Width="150"/>
-                <TextBox Width="150"/>
-                <TextBox Classes="Small" Width="150"/>
-            </StackPanel>
-
-            <StackPanel Orientation="Horizontal">
-                <TextBox IsEnabled="False" Width="150"/>
-                <TextBox Classes="Bordered" Width="150"/>
-                <TextBox Classes="Bordered" IsEnabled="False" Width="150"/>
-            </StackPanel>
-
             <TextBox Width="300" />
             <TextBox Width="300" Classes="Large" />
             <TextBox Width="300" Classes="Small" />
@@ -54,6 +42,35 @@
                 InnerLeftContent="http://"
                 InnerRightContent=".com"
                 IsEnabled="False" />
+
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    Width="150"
+                    Classes="Large"
+                    Watermark="Large" />
+                <TextBox
+                    Width="150"
+                    Watermark="Default" />
+                <TextBox
+                    Width="150"
+                    Classes="Small"
+                    Watermark="Small" />
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal">
+                <TextBox
+                    Width="150"
+                    IsEnabled="False"
+                    Watermark="Disabled" />
+                <TextBox
+                    Width="150"
+                    Classes="Bordered"
+                    Watermark="Bordered" />
+                <TextBox
+                    Width="150"
+                    Classes="Bordered"
+                    IsEnabled="False" />
+            </StackPanel>
         </StackPanel>
     </ScrollViewer>
 </UserControl>
diff --git a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
index 60e6019..d349fef 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
@@ -17,7 +17,7 @@
             <ToggleButton Classes="Success">Success</ToggleButton>
             <ToggleButton Classes="Warning">Warning</ToggleButton>
             <ToggleButton Classes="Danger">Danger</ToggleButton>
-            <ToggleButton Classes="Danger" IsEnabled="False">Danger</ToggleButton>
+            <ToggleButton Classes="Danger" IsEnabled="False">Disabled</ToggleButton>
         </StackPanel>
         <TextBlock Text="Toggle Button Checked State" />
         <StackPanel Orientation="Horizontal" Spacing="20">
@@ -32,7 +32,7 @@
                 Classes="Danger"
                 IsChecked="True"
                 IsEnabled="False">
-                Danger
+                Disabled
             </ToggleButton>
         </StackPanel>
         <TextBlock Text="Toggle Button Three State" />
@@ -79,7 +79,7 @@
                 IsChecked="{x:Null}"
                 IsEnabled="False"
                 IsThreeState="True">
-                Danger
+                Disabled
             </ToggleButton>
         </StackPanel>
         <StackPanel Orientation="Horizontal">