From cde9d6725198f3ff6554a11d28439602de14a022 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 17 Dec 2024 18:13:05 +0800
Subject: [PATCH] feat: add a border to template.

---
 demo/Ursa.Demo/Pages/MarqueeDemo.axaml      |  8 ++++++++
 src/Ursa.Themes.Semi/Controls/Marquee.axaml | 19 +++++++++++++------
 src/Ursa/Controls/Marquee/Marquee.cs        |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/MarqueeDemo.axaml b/demo/Ursa.Demo/Pages/MarqueeDemo.axaml
index a12956a..77040f1 100644
--- a/demo/Ursa.Demo/Pages/MarqueeDemo.axaml
+++ b/demo/Ursa.Demo/Pages/MarqueeDemo.axaml
@@ -25,6 +25,13 @@
                 u:FormItem.Label="VerticalContentAlignment"
                 EnumType="{x:Type VerticalAlignment}"
                 Value="{x:Static VerticalAlignment.Center}" />
+            <u:NumericDoubleUpDown 
+                Name="speed"
+                AllowDrag="True"
+                u:FormItem.Label="Speed"
+                Minimum="1"
+                Maximum="300"
+                Value="60"/>
             <ToggleSwitch
                 Name="running"
                 u:FormItem.Label="IsRunning"
@@ -35,6 +42,7 @@
             Height="100"
             HorizontalContentAlignment="{Binding #horizontal.Value}"
             VerticalContentAlignment="{Binding #vertical.Value}"
+            Speed="{Binding #speed.Value}"
             Background="{DynamicResource SemiBlue1}"
             Direction="{Binding #direction.Value}"
             IsRunning="{Binding #running.IsChecked}">
diff --git a/src/Ursa.Themes.Semi/Controls/Marquee.axaml b/src/Ursa.Themes.Semi/Controls/Marquee.axaml
index cb8d4bd..1cf94a2 100644
--- a/src/Ursa.Themes.Semi/Controls/Marquee.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Marquee.axaml
@@ -7,12 +7,19 @@
     <ControlTheme x:Key="{x:Type u:Marquee}" TargetType="u:Marquee">
         <Setter Property="Template">
             <ControlTemplate>
-                <Canvas Background="{TemplateBinding Background}">
-                    <ContentPresenter
-                        Name="{x:Static iri:PartNames.PART_ContentPresenter}"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}" />
-                </Canvas>
+                <Border
+                    Background="{TemplateBinding Background}"
+                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+                    <Canvas>
+                        <ContentPresenter
+                            Name="{x:Static iri:PartNames.PART_ContentPresenter}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                    </Canvas>
+                </Border>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
diff --git a/src/Ursa/Controls/Marquee/Marquee.cs b/src/Ursa/Controls/Marquee/Marquee.cs
index 60bc21a..a09d098 100644
--- a/src/Ursa/Controls/Marquee/Marquee.cs
+++ b/src/Ursa/Controls/Marquee/Marquee.cs
@@ -114,7 +114,7 @@ public class Marquee : ContentControl
         {
             Canvas.SetTop(Presenter, location.Value.top);
             Canvas.SetLeft(Presenter, location.Value.left);
-        }, DispatcherPriority.Background);
+        }, DispatcherPriority.Render);
     }
 
     private void InvalidatePresenterPosition()