From b90b606b97f408635b80be5587d6115e43845666 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Thu, 3 Apr 2025 19:36:01 +0800
Subject: [PATCH 1/2] fix: update ScrollViewer styles for improved scrollbar
 behavior

---
 src/Semi.Avalonia/Controls/ScrollViewer.axaml | 23 ++++++++++---------
 .../Themes/Shared/ScrollViewer.axaml          |  1 +
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
index a4096a4..6f14991 100644
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -39,13 +39,7 @@
 
     <ControlTheme x:Key="{x:Type ScrollBar}" TargetType="ScrollBar">
         <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Transitions">
-            <Transitions>
-                <DoubleTransition Property="Width" Duration="0:0:0.1" />
-                <DoubleTransition Property="Height" Duration="0:0:0.1" />
-                <!--<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />-->
-            </Transitions>
-        </Setter>
+        <Setter Property="ShowDelay" Value="0" />
         <Style Selector="^:horizontal">
             <Setter Property="Height" Value="{StaticResource ScrollBarThickness}" />
             <Setter Property="Template">
@@ -187,6 +181,13 @@
             </Setter>
         </Style>
         <Style Selector="^ /template/ Thumb#thumb">
+            <Setter Property="Transitions">
+                <Transitions>
+                    <DoubleTransition Property="Width" Duration="0:0:0.1" />
+                    <DoubleTransition Property="Height" Duration="0:0:0.1" />
+                    <!--<TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />-->
+                </Transitions>
+            </Setter>
             <Setter Property="Foreground" Value="{DynamicResource ScrollBarThumbForeground}" />
             <Setter Property="Template">
                 <ControlTemplate TargetType="Thumb">
@@ -201,11 +202,11 @@
             <Setter Property="Foreground" Value="{DynamicResource ScrollBarThumbPointeroverForeground}" />
         </Style>
         <Style Selector="^:horizontal /template/ Thumb#thumb">
-            <Setter Property="MinWidth" Value="{DynamicResource ScrollBarThickness}" />
+            <Setter Property="MinWidth" Value="{DynamicResource ScrollBarMinLength}" />
             <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
         </Style>
         <Style Selector="^:vertical /template/ Thumb#thumb">
-            <Setter Property="MinHeight" Value="{DynamicResource ScrollBarThickness}" />
+            <Setter Property="MinHeight" Value="{DynamicResource ScrollBarMinLength}" />
             <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
         </Style>
         <Style Selector="^ /template/ RepeatButton > PathIcon">
@@ -222,10 +223,10 @@
             <Style Selector="^ /template/ RepeatButton">
                 <Setter Property="IsVisible" Value="False" />
             </Style>
-            <Style Selector="^:vertical">
+            <Style Selector="^:vertical /template/ Thumb#thumb">
                 <Setter Property="Width" Value="2" />
             </Style>
-            <Style Selector="^:horizontal">
+            <Style Selector="^:horizontal /template/ Thumb#thumb">
                 <Setter Property="Height" Value="2" />
             </Style>
         </Style>
diff --git a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
index f13b5e8..7e62c4c 100644
--- a/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ScrollViewer.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ScrollBarThickness" ResourceKey="SemiSpacingTight" />
+    <x:Double x:Key="ScrollBarMinLength">24</x:Double>
     <StaticResource x:Key="ScrollBarThumbThickness" ResourceKey="SemiSpacingTight" />
     <StaticResource x:Key="ScrollBarThumbCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
     <StaticResource x:Key="ScrollBarUpGlyph" ResourceKey="SemiIconSmallTriangleTop" />

From eefc7dc3f215f99e10b89c124e48fff6a88bd78b Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Thu, 3 Apr 2025 19:46:27 +0800
Subject: [PATCH 2/2] fix: enhance ScrollViewer scrollbar alignment for better
 usability

---
 src/Semi.Avalonia/Controls/ScrollViewer.axaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
index 6f14991..5947061 100644
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -204,10 +204,12 @@
         <Style Selector="^:horizontal /template/ Thumb#thumb">
             <Setter Property="MinWidth" Value="{DynamicResource ScrollBarMinLength}" />
             <Setter Property="Height" Value="{DynamicResource ScrollBarThumbThickness}" />
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
         </Style>
         <Style Selector="^:vertical /template/ Thumb#thumb">
             <Setter Property="MinHeight" Value="{DynamicResource ScrollBarMinLength}" />
             <Setter Property="Width" Value="{DynamicResource ScrollBarThumbThickness}" />
+            <Setter Property="HorizontalAlignment" Value="Right"/>
         </Style>
         <Style Selector="^ /template/ RepeatButton > PathIcon">
             <Setter Property="Foreground" Value="{DynamicResource ScrollBarButtonDefaultForeground}" />