From dcba26e8af9fa626fdeba931ec498ab357f15c17 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 17 Sep 2024 23:13:56 +0800
Subject: [PATCH] feat: Update demo. improve resizer margin for drawer.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml            | 4 ++++
 demo/Ursa.Demo/Pages/DrawerDemo.axaml            | 1 +
 demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs | 8 ++++++++
 demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs | 2 ++
 src/Ursa.Themes.Semi/Controls/Drawer.axaml       | 8 ++++++++
 5 files changed, 23 insertions(+)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 0331fa4..2b4fe18 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -50,6 +50,7 @@
                         IsChecked="{Binding IsCloseButtonVisible}"
                         IsThreeState="True" />
                     <CheckBox u:FormItem.Label="CanDragMove" IsChecked="{Binding CanDragMove}" />
+                    <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"
@@ -85,6 +86,7 @@
                         IsThreeState="True" />
                     <CheckBox u:FormItem.Label="Modal" IsChecked="{Binding IsModal}" />
                     <CheckBox u:FormItem.Label="CanDragMove" IsChecked="{Binding CanDragMove}" />
+                    <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"
@@ -120,6 +122,7 @@
                     <CheckBox u:FormItem.Label="Can DragMove" IsChecked="{Binding CanDragMove}" />
                     <CheckBox u:FormItem.Label="Can LightDismiss" IsChecked="{Binding CanLightDismiss}" />
                     <CheckBox u:FormItem.Label="FullScreen" IsChecked="{Binding FullScreen}" />
+                    <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
                     <ToggleSwitch
                         u:FormItem.Label="Global/Local OverlayHost"
                         IsChecked="{Binding IsLocal}"
@@ -150,6 +153,7 @@
                     <CheckBox u:FormItem.Label="Can DragMove" IsChecked="{Binding CanDragMove}" />
                     <CheckBox u:FormItem.Label="Can LightDismiss" IsChecked="{Binding CanLightDismiss}" />
                     <CheckBox u:FormItem.Label="FullScreen" IsChecked="{Binding FullScreen}" />
+                    <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
                     <ToggleSwitch
                         u:FormItem.Label="Global/Local OverlayHost"
                         IsChecked="{Binding IsLocal}"
diff --git a/demo/Ursa.Demo/Pages/DrawerDemo.axaml b/demo/Ursa.Demo/Pages/DrawerDemo.axaml
index 614bdfb..c520215 100644
--- a/demo/Ursa.Demo/Pages/DrawerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DrawerDemo.axaml
@@ -27,6 +27,7 @@
             <CheckBox u:FormItem.Label="Is Modal" IsChecked="{Binding IsModal}"/>
             <CheckBox u:FormItem.Label="Is Close Button Visible" IsChecked="{Binding IsCloseButtonVisible}" IsThreeState="True"/>
             <CheckBox u:FormItem.Label="Custom Dialog" IsChecked="{Binding Custom}"/>
+            <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
             <ToggleSwitch
                 u:FormItem.Label="Global/Local OverlayHost"
                 IsChecked="{Binding IsLocal}"
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 7b3e95e..59d5da6 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -32,6 +32,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
     [ObservableProperty] private bool _showInTaskBar;
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _canDragMove;
+    [ObservableProperty] private bool _canResize;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -55,6 +56,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
             IsCloseButtonVisible = IsCloseButtonVisible,
             StartupLocation = Location,
             CanDragMove = CanDragMove,
+            CanResize = CanResize,
         };
         if (X.HasValue && Y.HasValue)
         {
@@ -74,6 +76,7 @@ public partial class CustomWindowDialogDemoViewModel: ObservableObject
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _isModal;
     [ObservableProperty] private bool _canDragMove;
+    [ObservableProperty] private bool _canResize;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -94,6 +97,7 @@ public partial class CustomWindowDialogDemoViewModel: ObservableObject
             IsCloseButtonVisible = IsCloseButtonVisible,
             StartupLocation = Location,
             CanDragMove = CanDragMove,
+            CanResize = CanResize,
         };
         if (X.HasValue && Y.HasValue)
         {
@@ -128,6 +132,7 @@ public partial class DefaultOverlayDialogDemoViewModel : ObservableObject
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _isModal;
     [ObservableProperty] private bool _isLocal;
+    [ObservableProperty] private bool _canResize;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -157,6 +162,7 @@ public partial class DefaultOverlayDialogDemoViewModel : ObservableObject
             CanLightDismiss = CanLightDismiss,
             CanDragMove = CanDragMove,
             IsCloseButtonVisible = IsCloseButtonVisible,
+            CanResize = CanResize,
         };
         string? dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
         if (IsModal)
@@ -183,6 +189,7 @@ public partial class CustomOverlayDialogDemoViewModel: ObservableObject
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _isModal;
     [ObservableProperty] private bool _isLocal;
+    [ObservableProperty] private bool _canResize;
     
     public ICommand ShowDialogCommand { get; }
 
@@ -208,6 +215,7 @@ public partial class CustomOverlayDialogDemoViewModel: ObservableObject
             CanLightDismiss = CanLightDismiss,
             CanDragMove = CanDragMove,
             IsCloseButtonVisible = IsCloseButtonVisible,
+            CanResize = CanResize,
         };
         var dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
         if (IsModal)
diff --git a/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
index e025c00..52e6283 100644
--- a/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
@@ -24,6 +24,7 @@ public partial class DrawerDemoViewModel : ObservableObject
 
     [ObservableProperty] private bool _custom;
     [ObservableProperty] private bool _isLocal;
+    [ObservableProperty] private bool _canResize;
 
     public DrawerDemoViewModel()
     {
@@ -42,6 +43,7 @@ public partial class DrawerDemoViewModel : ObservableObject
             CanLightDismiss = CanLightDismiss,
             IsCloseButtonVisible = IsCloseButtonVisible,
             Title = Title,
+            CanResize = CanResize,
         };
         var hostId = IsLocal ? "LocalHost" : null;
         if (Custom)
diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index ac3657f..3800d0f 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -78,15 +78,19 @@
             <Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
         </Style>
         <Style Selector="^[Position=Top] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
             <Setter Property="ResizeDirection" Value="Bottom"/>
         </Style>
         <Style Selector="^[Position=Bottom] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
             <Setter Property="ResizeDirection" Value="Top"/>
         </Style>
         <Style Selector="^[Position=Left] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
             <Setter Property="ResizeDirection" Value="Right"/>
         </Style>
         <Style Selector="^[Position=Right] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
             <Setter Property="ResizeDirection" Value="Left"/>
         </Style>
     </ControlTheme>
@@ -203,15 +207,19 @@
             <Setter Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
         </Style>
         <Style Selector="^[Position=Top] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Bottom}}" />
             <Setter Property="ResizeDirection" Value="Bottom"/>
         </Style>
         <Style Selector="^[Position=Bottom] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Top}}" />
             <Setter Property="ResizeDirection" Value="Top"/>
         </Style>
         <Style Selector="^[Position=Left] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Right}}" />
             <Setter Property="ResizeDirection" Value="Right"/>
         </Style>
         <Style Selector="^[Position=Right] /template/ u|DialogResizer">
+            <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
             <Setter Property="ResizeDirection" Value="Left"/>
         </Style>
     </ControlTheme>