From 0d8b18ffaecd95a629c16f3feb9c437da6953f07 Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Tue, 23 Sep 2025 13:03:05 +0300
Subject: [PATCH 1/7] Added pausing to Marquee and improved state transition
 logic

---
 components/Marquee/src/Marquee.Events.cs     |  30 ++-
 components/Marquee/src/Marquee.Properties.cs |  46 ++--
 components/Marquee/src/Marquee.cs            | 223 ++++++++++++++-----
 components/Marquee/src/Marquee.xaml          |  10 +-
 4 files changed, 226 insertions(+), 83 deletions(-)

diff --git a/components/Marquee/src/Marquee.Events.cs b/components/Marquee/src/Marquee.Events.cs
index 53502d7e2..03c11a558 100644
--- a/components/Marquee/src/Marquee.Events.cs
+++ b/components/Marquee/src/Marquee.Events.cs
@@ -12,13 +12,26 @@ public partial class Marquee
     /// <summary>
     /// Event raised when the Marquee begins scrolling.
     /// </summary>
-    public event EventHandler? MarqueeBegan;
+    /// <remarks>
+    /// Could be started. Could be resumed.
+    /// </remarks>
+    public event EventHandler? MarqueeStarted;
 
     /// <summary>
-    /// Event raised when the Marquee stops scrolling for any reason.
+    /// Event raised when the Marquee is stopped manually or completed.
     /// </summary>
     public event EventHandler? MarqueeStopped;
 
+    /// <summary>
+    /// Event raised when the Marquee is resumed from a pause.
+    /// </summary>
+    public event EventHandler? MarqueeResumed;
+
+    /// <summary>
+    /// Event raised when the Marquee is paused.
+    /// </summary>
+    public event EventHandler? MarqueePaused;
+
     /// <summary>
     /// Event raised when the Marquee completes scrolling.
     /// </summary>
@@ -72,8 +85,15 @@ private void Container_SizeChanged(object sender, SizeChangedEventArgs e)
             Rect = new Rect(0, 0, e.NewSize.Width, e.NewSize.Height)
         };
 
+        // Update animation on the fly
+        UpdateMarquee(true);
+
         // The marquee should run when the size changes in case the text gets cutoff
-        StartMarquee();
+        // and auto play is enabled.
+        if (AutoPlay)
+        {
+            StartMarquee();
+        }
     }
 
     private void Segment_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -85,12 +105,12 @@ private void Segment_SizeChanged(object sender, SizeChangedEventArgs e)
 
         // If the segment size changes, we need to update the storyboard,
         // and seek to the correct position to maintain a smooth animation.
-        UpdateAnimation(true);
+        UpdateMarquee(true);
     }
 
     private void StoryBoard_Completed(object? sender, object e)
     {
-        StopMarquee(true);
+        StopMarquee();
         MarqueeCompleted?.Invoke(this, EventArgs.Empty);
     }
 }
diff --git a/components/Marquee/src/Marquee.Properties.cs b/components/Marquee/src/Marquee.Properties.cs
index 000817633..107896ebf 100644
--- a/components/Marquee/src/Marquee.Properties.cs
+++ b/components/Marquee/src/Marquee.Properties.cs
@@ -11,6 +11,9 @@ namespace CommunityToolkit.WinUI.Controls;
 /// </summary>
 public partial class Marquee
 {
+    private static readonly DependencyProperty AutoPlayProperty =
+        DependencyProperty.Register(nameof(AutoPlay), typeof(bool), typeof(Marquee), new PropertyMetadata(false));
+    
     private static readonly DependencyProperty SpeedProperty =
         DependencyProperty.Register(nameof(Speed), typeof(double), typeof(Marquee), new PropertyMetadata(32d, PropertyChanged));
 
@@ -18,11 +21,20 @@ public partial class Marquee
         DependencyProperty.Register(nameof(RepeatBehavior), typeof(RepeatBehavior), typeof(Marquee), new PropertyMetadata(new RepeatBehavior(1), PropertyChanged));
 
     private static readonly DependencyProperty BehaviorProperty =
-        DependencyProperty.Register(nameof(Behavior), typeof(MarqueeBehavior), typeof(Marquee), new PropertyMetadata(0, BehaviorPropertyChanged));
+        DependencyProperty.Register(nameof(Behavior), typeof(MarqueeBehavior), typeof(Marquee), new PropertyMetadata(MarqueeBehavior.Ticker, BehaviorPropertyChanged));
 
     private static readonly DependencyProperty DirectionProperty =
         DependencyProperty.Register(nameof(Direction), typeof(MarqueeDirection), typeof(Marquee), new PropertyMetadata(MarqueeDirection.Left, DirectionPropertyChanged));
 
+    /// <summary>
+    /// Gets or sets whether or not the Marquee plays immediately upon loading or updating a property.
+    /// </summary>
+    public bool AutoPlay
+    {
+        get => (bool)GetValue(AutoPlayProperty);
+        set => SetValue(AutoPlayProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets the speed the text moves in the Marquee.
     /// </summary>
@@ -79,17 +91,16 @@ public MarqueeDirection Direction
     private static void BehaviorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is not Marquee control)
-        {
             return;
-        }
 
-        bool active = control._isActive;
         var newBehavior = (MarqueeBehavior)e.NewValue;
 
         VisualStateManager.GoToState(control, GetVisualStateName(newBehavior), true);
 
-        control.StopMarquee(false);
-        if (active)
+        // It is always impossible to perform an on the fly behavior change.
+        control.UpdateMarquee(false);
+
+        if (control.AutoPlay)
         {
             control.StartMarquee();
         }
@@ -98,11 +109,8 @@ private static void BehaviorPropertyChanged(DependencyObject d, DependencyProper
     private static void DirectionPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is not Marquee control)
-        {
             return;
-        }
 
-        bool active = control._isActive;
         var oldDirection = (MarqueeDirection)e.OldValue;
         var newDirection = (MarqueeDirection)e.NewValue;
         bool oldAxisX = oldDirection is MarqueeDirection.Left or MarqueeDirection.Right;
@@ -110,12 +118,11 @@ private static void DirectionPropertyChanged(DependencyObject d, DependencyPrope
 
         VisualStateManager.GoToState(control, GetVisualStateName(newDirection), true);
 
-        if (oldAxisX != newAxisX)
-        {
-            control.StopMarquee(false);
-        }
+        // If the axis changed we cannot update the animation on the fly.
+        // Otherwise, the animation can be updated and resumed seamlessly
+        control.UpdateMarquee(oldAxisX == newAxisX);
 
-        if (active)
+        if (control.AutoPlay)
         {
             control.StartMarquee();
         }
@@ -124,10 +131,15 @@ private static void DirectionPropertyChanged(DependencyObject d, DependencyPrope
     private static void PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is not Marquee control)
-        {
             return;
-        }
 
-        control.UpdateAnimation();
+        // It is always possible to update these properties on the fly.
+        // NOTE: The RepeatBehavior will reset its count though. Can this be fixed?
+        control.UpdateMarquee(true);
+
+        if (control.AutoPlay)
+        {
+            control.StartMarquee();
+        }
     }
 }
diff --git a/components/Marquee/src/Marquee.cs b/components/Marquee/src/Marquee.cs
index d29d2e04a..0f054c308 100644
--- a/components/Marquee/src/Marquee.cs
+++ b/components/Marquee/src/Marquee.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace CommunityToolkit.WinUI.Controls;
 
 /// <summary>
@@ -26,6 +28,7 @@ public partial class Marquee : ContentControl
     private const string MarqueeTransformPartName = "MarqueeTransform";
 
     private const string MarqueeActiveState = "MarqueeActive";
+    private const string MarqueePausedState = "MarqueePaused";
     private const string MarqueeStoppedState = "MarqueeStopped";
 
     private const string DirectionVisualStateGroupName = "DirectionStateGroup";
@@ -45,7 +48,10 @@ public partial class Marquee : ContentControl
     private TranslateTransform? _marqueeTransform;
     private Storyboard? _marqueeStoryboard;
 
-    private bool _isActive;
+    // Used to track if the marquee is active or not.
+    // This signifies being mid animation. A paused marquee is still active!
+    private bool _isActive = false;
+    private bool _isPaused = false;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Marquee"/> class.
@@ -104,19 +110,54 @@ private static string GetVisualStateName(MarqueeBehavior behavior)
     }
 
     /// <summary>
-    /// Begins the Marquee animation if not running.
+    /// Begins the Marquee animation if not running or resumes if paused.
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown when template parts are not supplied.</exception>
-    public void StartMarquee()
+    public void StartMarquee() => PlayMarquee(fromStart: false);
+
+    /// <summary>
+    /// Restarts the Marquee from the start of the animation regardless of current state.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="MarqueeStarted"/> will not be raised if the marquee was already active.
+    /// </remarks>
+    public void RestartMarquee() => PlayMarquee(fromStart: true);
+
+    /// <summary>
+    /// Resumes the Marquee animation if paused.
+    /// </summary>
+    public void ResumeMarquee()
     {
-        bool initial = _isActive;
-        _isActive = true;
-        bool playing = UpdateAnimation(initial);
+        // If not paused or not active, do nothing
+        if (!_isPaused || !_isActive)
+            return;
+
+        // Resume the storyboard
+        _isPaused = false;
+        _marqueeStoryboard?.Resume();
+
+        // Apply state transitions
+        VisualStateManager.GoToState(this, MarqueeActiveState, false);
+        MarqueeResumed?.Invoke(this, EventArgs.Empty);
+    }
 
-        // Invoke MarqueeBegan if Marquee is now playing and was not before
-        if (playing && !initial)
+    /// <summary>
+    /// Pauses the Marquee animation.
+    /// </summary>
+    public void PauseMarquee()
+    {
+        // Log initial paused status
+        bool wasPaused = _isPaused;
+
+        // Ensure paused status
+        _marqueeStoryboard?.Pause();
+        _isPaused = true;
+
+        if (!wasPaused)
         {
-            MarqueeBegan?.Invoke(this, EventArgs.Empty);
+            // Apply state transitions
+            VisualStateManager.GoToState(this, MarqueePausedState, false);
+            MarqueePaused?.Invoke(this, EventArgs.Empty);
         }
     }
 
@@ -126,49 +167,107 @@ public void StartMarquee()
     /// <exception cref="InvalidOperationException">Thrown when template parts are not supplied.</exception>
     public void StopMarquee()
     {
-        StopMarquee(_isActive);
-    }
+        bool wasStopped = !_isActive;
 
-    private void StopMarquee(bool initialState)
-    {
-        // Set _isActive and update the animation to match
+        // Ensure stopped status
+        _marqueeStoryboard?.Stop();
         _isActive = false;
-        bool playing = UpdateAnimation(false);
+        _isPaused = false;
 
-        // Invoke MarqueeStopped if Marquee is not playing and was before
-        if (!playing && initialState)
+        if (!wasStopped)
         {
+            // Apply state transitions
+            VisualStateManager.GoToState(this, MarqueeStoppedState, false);
             MarqueeStopped?.Invoke(this, EventArgs.Empty);
         }
     }
 
-    /// <summary>
-    /// Updates the animation to match the current control state.
-    /// </summary>
-    /// <param name="resume">True if animation should resume from its current position, false if it should restart.</param>
-    /// <exception cref="InvalidOperationException">Thrown when template parts are not supplied.</exception>
-    /// <returns>True if the Animation is now playing.</returns>
-    private bool UpdateAnimation(bool resume = true)
+    private void PlayMarquee(bool fromStart = false)
     {
-        // Crucial template parts are missing!
-        // This can happen during initialization of certain properties.
-        // Gracefully return when this happens. Proper checks for these template parts happen in OnApplyTemplate.
-        if (_marqueeContainer is null ||
-            _marqueeTransform is null ||
-            _segment1 is null ||
-            _segment2 is null)
+        // Resume if paused and not playing from start
+        if (!fromStart && _isPaused && _isActive)
         {
-            return false;
+            ResumeMarquee();
+            return;
         }
 
-        // The marquee is stopped.
-        // Update the animation to the stopped position.
-        if (!_isActive)
+        // Do nothing if storyboard is null or already playing and not from start.
+        if (_marqueeStoryboard is null || _isActive && !fromStart)
+            return;
+
+        bool wasActive = _isActive;
+
+        // Stop the storboard if it is already active and playing from start
+        if (fromStart)
         {
-            VisualStateManager.GoToState(this, MarqueeStoppedState, false);
+            _marqueeStoryboard.Stop();
+        }
 
-            return false;
+        // Start the storyboard
+        _marqueeStoryboard.Begin();
+
+        // Update the status variables
+        _isActive = true;
+        _isPaused = false;
+
+        if (!wasActive)
+        {
+            // Apply state transitions
+            VisualStateManager.GoToState(this, MarqueeActiveState, false);
+            MarqueeStarted?.Invoke(this, EventArgs.Empty);
         }
+    }
+
+    private void UpdateMarquee(bool onTheFly)
+    {
+        // Check for crucial template parts
+        if(!HasTemplateParts())
+            return;
+
+        // If the update cannot be made on the fly,
+        // stop the marquee and reset the transform
+        if (!onTheFly)
+        {
+            StopMarquee();
+            _marqueeTransform.X = 0;
+            _marqueeTransform.Y = 0;
+        }
+
+        // Apply the animation update
+        bool hasAnimation = UpdateAnimation(out var seek);
+
+        // If updating on the fly, and there is an animation,
+        // seek to the correct position
+        if (onTheFly && hasAnimation && _isActive)
+        {
+            _marqueeStoryboard?.Begin();
+            _marqueeStoryboard?.Seek(seek);
+
+            // Restore paused state if necessary
+            if (_isPaused)
+            {
+                PauseMarquee();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Updates the animation to match the current control state.
+    /// </summary>
+    /// <remarks>
+    /// When in looping mode, it is possible that no animation is necessary.
+    /// </remarks>
+    /// <param name="seekPoint">The seek point to resume the animation (if possible or appropriate.</param>
+    /// <exception cref="InvalidOperationException">Thrown when template parts are not supplied.</exception>
+    /// <returns>Returns whether or not an animation is neccesary.</returns>
+    [MemberNotNullWhen(true, nameof(_marqueeStoryboard))]
+    private bool UpdateAnimation(out TimeSpan seekPoint)
+    {
+        seekPoint = TimeSpan.Zero;
+
+        // Check for crucial template parts
+        if (!HasTemplateParts())
+            return false;
 
         // Get the size of the container and segment, based on the orientation.
         // Also track the property to adjust, also based on the orientation.
@@ -204,18 +303,17 @@ _segment1 is null ||
             // If the marquee is in looping mode and the segment is smaller
             // than the container, then the animation does not not need to play.
 
-            // NOTE: Use resume as initial because _isActive is updated before
-            // calling update animation. If _isActive were passed, it would allow for
-            // MarqueeStopped to be invoked when the marquee was already stopped.
-            StopMarquee(resume);
+            // Reset the transform to 0 and hide the second segment
+            _marqueeContainer.SetValue(dp, 0);
             _segment2.Visibility = Visibility.Collapsed;
-            
+
+            _marqueeStoryboard = null;
             return false;
         }
 
         // The start position is offset 100% if in ticker mode
         // Otherwise it's 0
-        double start = IsTicker ? containerSize : 0;
+        double start = IsTicker ? containerSize + 1 : 0;
 
         // The end is when the end of the text reaches the border if in bouncing mode
         // Otherwise it is when the first set of text is 100% out of view
@@ -255,17 +353,6 @@ _segment1 is null ||
         // Bind the storyboard completed event
         _marqueeStoryboard.Completed += StoryBoard_Completed;
 
-        // Set the visual state to active and begin the animation
-        VisualStateManager.GoToState(this, MarqueeActiveState, true);
-        _marqueeStoryboard.Begin();
-        
-        // If resuming, seek the animation so the text resumes from its current position.
-        if (resume)
-        {
-            double progress = Math.Abs(start - value) / distance;
-            _marqueeStoryboard.Seek(TimeSpan.FromTicks((long)(duration.Ticks * progress)));
-        }
-        
         // NOTE: Can this be optimized to remove or reduce the need for this callback?
         // Invalidate the segment measures when the transform changes.
         // This forces virtualized panels to re-measure the segments
@@ -275,6 +362,17 @@ _segment1 is null ||
             _segment2.InvalidateMeasure();
         });
 
+        // Calculate the seek point for seamless animation updates
+        double progress = Math.Abs(start - value) / distance;
+        seekPoint = TimeSpan.FromTicks((long)(duration.Ticks * progress));
+
+        // Set the value of the transform to the start position if not active.
+        // This puts the content in the correct starting position without using the animation.
+        if (!_isActive)
+        {
+            _marqueeTransform.SetValue(dp, start);
+        }
+
         return true;
     }
 
@@ -325,4 +423,21 @@ private Storyboard CreateMarqueeStoryboardAnimation(double start, double end, Ti
 
         return marqueeStoryboard;
     }
+
+    [MemberNotNullWhen(true, nameof(_marqueeContainer), nameof(_marqueeTransform), nameof(_segment1), nameof(_segment2))]
+    private bool HasTemplateParts()
+    {
+        if (_marqueeContainer is null ||
+            _marqueeTransform is null ||
+            _segment1 is null ||
+            _segment2 is null)
+        {
+            // Crucial template parts are missing!
+            // This can happen during initialization of certain properties.
+            // Gracefully return when this happens. Proper checks for these template parts happen in OnApplyTemplate.
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/components/Marquee/src/Marquee.xaml b/components/Marquee/src/Marquee.xaml
index 73f6ec52c..ab1367556 100644
--- a/components/Marquee/src/Marquee.xaml
+++ b/components/Marquee/src/Marquee.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
@@ -20,12 +20,8 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="MarqueeStateGroup">
                                 <VisualState x:Name="MarqueeActive" />
-                                <VisualState x:Name="MarqueeStopped">
-                                    <VisualState.Setters>
-                                        <Setter Target="MarqueeTransform.X" Value="0.0" />
-                                        <Setter Target="MarqueeTransform.Y" Value="0.0" />
-                                    </VisualState.Setters>
-                                </VisualState>
+                                <VisualState x:Name="MarqueePaused" />
+                                <VisualState x:Name="MarqueeStopped" />
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="DirectionStateGroup">
                                 <VisualState x:Name="Leftwards">

From 6052375f54b6feb747f70916937ba1a5696e97f3 Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Tue, 23 Sep 2025 13:11:41 +0300
Subject: [PATCH 2/7] Updated Marquee samples

---
 components/Marquee/samples/Marquee.md         |  6 ++
 .../samples/MarqueeBehaviorSample.xaml        | 56 +++++++++++++++++++
 .../samples/MarqueeBehaviorSample.xaml.cs     | 14 +++++
 components/Marquee/samples/MarqueeSample.xaml |  5 +-
 .../samples/MarqueeText.Samples.csproj        | 12 +++-
 .../Marquee/samples/MarqueeTextSample.xaml    | 18 +++++-
 .../Marquee/samples/MarqueeTextSample.xaml.cs |  9 +++
 7 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 components/Marquee/samples/MarqueeBehaviorSample.xaml
 create mode 100644 components/Marquee/samples/MarqueeBehaviorSample.xaml.cs

diff --git a/components/Marquee/samples/Marquee.md b/components/Marquee/samples/Marquee.md
index 69f8e9a96..ecb85181d 100644
--- a/components/Marquee/samples/Marquee.md
+++ b/components/Marquee/samples/Marquee.md
@@ -50,3 +50,9 @@ The default direction is left, meaning the content will move leftwards, but this
 It is possible to use non-text content in the Marquee control. However templating must be used because the control will need to be duplicated for the looping animation.
 
 > [!Sample MarqueeSample]
+
+# Level Up with Behaviors
+
+Use behaviors to triggers the Marquee on events
+
+> [!Sample MarqueeBehaviorSample]
diff --git a/components/Marquee/samples/MarqueeBehaviorSample.xaml b/components/Marquee/samples/MarqueeBehaviorSample.xaml
new file mode 100644
index 000000000..bfcf6071d
--- /dev/null
+++ b/components/Marquee/samples/MarqueeBehaviorSample.xaml
@@ -0,0 +1,56 @@
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<Page x:Class="MarqueeExperiment.Samples.MarqueeBehaviorSample"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:local="MarqueeExperiment.Samples"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <StackPanel Padding="16">
+        <TextBlock FontWeight="Bold"
+                   Text="This Marquee will loop once when hovered." />
+        <controls:Marquee x:Name="Loop1Marquee"
+                          Background="Transparent"
+                          Behavior="Ticker"
+                          Content="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+                          FontSize="18"
+                          RepeatBehavior="1x"
+                          Speed="256">
+            <interactivity:Interaction.Behaviors>
+                <interactivity:EventTriggerBehavior EventName="PointerEntered"
+                                                    SourceObject="{Binding ElementName=Loop1Marquee}">
+                    <interactivity:CallMethodAction MethodName="StartMarquee"
+                                                    TargetObject="{Binding ElementName=Loop1Marquee}" />
+                </interactivity:EventTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </controls:Marquee>
+
+        <TextBlock Margin="0,16,0,0"
+                   FontWeight="Bold"
+                   Text="This Marquee will loop while hovered and pause when not hovered." />
+        <controls:Marquee x:Name="MarqueeControl"
+                          Background="Transparent"
+                          Behavior="Looping"
+                          Content="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+                          FontSize="18"
+                          RepeatBehavior="Forever"
+                          Speed="96">
+            <interactivity:Interaction.Behaviors>
+                <interactivity:EventTriggerBehavior EventName="PointerEntered"
+                                                    SourceObject="{Binding ElementName=MarqueeControl}">
+                    <interactivity:CallMethodAction MethodName="StartMarquee"
+                                                    TargetObject="{Binding ElementName=MarqueeControl}" />
+                </interactivity:EventTriggerBehavior>
+                <interactivity:EventTriggerBehavior EventName="PointerExited"
+                                                    SourceObject="{Binding ElementName=MarqueeControl}">
+                    <interactivity:CallMethodAction MethodName="PauseMarquee"
+                                                    TargetObject="{Binding ElementName=MarqueeControl}" />
+                </interactivity:EventTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </controls:Marquee>
+    </StackPanel>
+</Page>
diff --git a/components/Marquee/samples/MarqueeBehaviorSample.xaml.cs b/components/Marquee/samples/MarqueeBehaviorSample.xaml.cs
new file mode 100644
index 000000000..e4bc7a8bf
--- /dev/null
+++ b/components/Marquee/samples/MarqueeBehaviorSample.xaml.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace MarqueeExperiment.Samples;
+
+[ToolkitSample(id: nameof(MarqueeBehaviorSample), "Marquee", description: "A control for scrolling content in a marquee fashion.")]
+public sealed partial class MarqueeBehaviorSample : Page
+{
+    public MarqueeBehaviorSample()
+    {
+        this.InitializeComponent();
+    }
+}
diff --git a/components/Marquee/samples/MarqueeSample.xaml b/components/Marquee/samples/MarqueeSample.xaml
index 5a37d7777..ad9325679 100644
--- a/components/Marquee/samples/MarqueeSample.xaml
+++ b/components/Marquee/samples/MarqueeSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="MarqueeExperiment.Samples.MarqueeSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -9,7 +9,8 @@
       mc:Ignorable="d">
 
     <StackPanel Padding="16">
-        <controls:Marquee Behavior="{x:Bind ConvertStringToMarqueeBehavior(MQBehavior), Mode=OneWay}"
+        <controls:Marquee AutoPlay="True"
+                          Behavior="{x:Bind ConvertStringToMarqueeBehavior(MQBehavior), Mode=OneWay}"
                           Content="{x:Bind Data}"
                           Direction="{x:Bind ConvertStringToMarqueeDirection(MQDirection), Mode=OneWay}"
                           FontSize="18"
diff --git a/components/Marquee/samples/MarqueeText.Samples.csproj b/components/Marquee/samples/MarqueeText.Samples.csproj
index 05b200ace..ae8594845 100644
--- a/components/Marquee/samples/MarqueeText.Samples.csproj
+++ b/components/Marquee/samples/MarqueeText.Samples.csproj
@@ -7,11 +7,19 @@
   <!-- Sets this up as a toolkit component's sample project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Update="MarqueeBehaviorSampl.xaml.cs">
+      <DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
+    </Compile>
+    <Compile Update="MarqueeBehaviorSample.xaml.cs">
+      <DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
+    </Compile>
     <Compile Update="MarqueeTextSample.xaml.cs">
       <DependentUpon>MarqueeTextSample.xaml</DependentUpon>
     </Compile>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Update="MarqueeSample.xaml.cs">
       <DependentUpon>MarqueeSample.xaml</DependentUpon>
     </Compile>
diff --git a/components/Marquee/samples/MarqueeTextSample.xaml b/components/Marquee/samples/MarqueeTextSample.xaml
index 3912726e9..7d5d25bd6 100644
--- a/components/Marquee/samples/MarqueeTextSample.xaml
+++ b/components/Marquee/samples/MarqueeTextSample.xaml
@@ -1,4 +1,4 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="MarqueeExperiment.Samples.MarqueeTextSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,12 +8,24 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
-    <StackPanel Padding="16">
-        <controls:Marquee Behavior="{x:Bind ConvertStringToMarqueeBehavior(MQBehavior), Mode=OneWay}"
+    <StackPanel Padding="16"
+                Spacing="8">
+        <controls:Marquee x:Name="MarqueeControl"
+                          AutoPlay="{x:Bind MQAuto, Mode=OneWay}"
+                          Behavior="{x:Bind ConvertStringToMarqueeBehavior(MQBehavior), Mode=OneWay}"
                           Content="{x:Bind MQText, Mode=OneWay}"
                           Direction="{x:Bind ConvertStringToMarqueeDirection(MQDirection), Mode=OneWay}"
                           FontSize="18"
                           RepeatBehavior="Forever"
                           Speed="{x:Bind MQSpeed, Mode=OneWay}" />
+
+        <Button Click="StartMarquee_Click"
+                Content="Start Marquee" />
+        <Button Click="StopMarquee_Click"
+                Content="Stop Marquee" />
+        <Button Click="PauseMarquee_Click"
+                Content="Pause Marquee" />
+        <Button Click="ResumeMarquee_Click"
+                Content="Resume Marquee" />
     </StackPanel>
 </Page>
diff --git a/components/Marquee/samples/MarqueeTextSample.xaml.cs b/components/Marquee/samples/MarqueeTextSample.xaml.cs
index d42d73b9c..8ef7eccb7 100644
--- a/components/Marquee/samples/MarqueeTextSample.xaml.cs
+++ b/components/Marquee/samples/MarqueeTextSample.xaml.cs
@@ -16,6 +16,7 @@ namespace MarqueeExperiment.Samples;
 #else
 [ToolkitSampleMultiChoiceOption("MQBehavior", "Ticker", "Looping", Title = "Marquee Behavior")]
 #endif
+[ToolkitSampleBoolOption("MQAuto", true, Title = "Auto Play")]
 public sealed partial class MarqueeTextSample : Page
 {
     public MarqueeTextSample()
@@ -41,4 +42,12 @@ public MarqueeTextSample()
         "Down" => MarqueeDirection.Down,
         _ => throw new System.NotImplementedException(),
     };
+
+    private void StartMarquee_Click(object sender, RoutedEventArgs e) => MarqueeControl.StartMarquee();
+
+    private void StopMarquee_Click(object sender, RoutedEventArgs e) => MarqueeControl.StopMarquee();
+
+    private void ResumeMarquee_Click(object sender, RoutedEventArgs e) => MarqueeControl.ResumeMarquee();
+
+    private void PauseMarquee_Click(object sender, RoutedEventArgs e) => MarqueeControl.PauseMarquee();
 }

From cc67dddc1cbc2a8272aa5aaa5fcae17a75e7e326 Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Tue, 23 Sep 2025 20:14:26 +0300
Subject: [PATCH 3/7] Adjusted event bindings flow in Marquee control

---
 components/Marquee/src/Marquee.Events.cs | 19 +++++++++------
 components/Marquee/src/Marquee.cs        | 31 +++++++++++++++---------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/components/Marquee/src/Marquee.Events.cs b/components/Marquee/src/Marquee.Events.cs
index 03c11a558..fed5509de 100644
--- a/components/Marquee/src/Marquee.Events.cs
+++ b/components/Marquee/src/Marquee.Events.cs
@@ -12,9 +12,6 @@ public partial class Marquee
     /// <summary>
     /// Event raised when the Marquee begins scrolling.
     /// </summary>
-    /// <remarks>
-    /// Could be started. Could be resumed.
-    /// </remarks>
     public event EventHandler? MarqueeStarted;
 
     /// <summary>
@@ -41,7 +38,7 @@ private void Marquee_Loaded(object sender, RoutedEventArgs e)
     {
         // While loaded, detach the loaded event and attach the unloaded event
         this.Loaded -= this.Marquee_Loaded;
-        this.Unloaded += Marquee_Unloaded;
+        this.Unloaded += this.Marquee_Unloaded;
 
         // Attach other events
         if (_marqueeContainer is not null)
@@ -49,6 +46,11 @@ private void Marquee_Loaded(object sender, RoutedEventArgs e)
             _marqueeContainer.SizeChanged += Container_SizeChanged;
         }
 
+        if (_segment1 is not null)
+        {
+            _segment1.SizeChanged += Segment_SizeChanged;
+        }
+
         if (_marqueeStoryboard is not null)
         {
             _marqueeStoryboard.Completed += StoryBoard_Completed;
@@ -66,6 +68,11 @@ private void Marquee_Unloaded(object sender, RoutedEventArgs e)
             _marqueeContainer.SizeChanged -= Container_SizeChanged;
         }
 
+        if (_segment1 is not null)
+        {
+            _segment1.SizeChanged -= Segment_SizeChanged;
+        }
+
         if (_marqueeStoryboard is not null)
         {
             _marqueeStoryboard.Completed -= StoryBoard_Completed;
@@ -75,9 +82,7 @@ private void Marquee_Unloaded(object sender, RoutedEventArgs e)
     private void Container_SizeChanged(object sender, SizeChangedEventArgs e)
     {
         if (_marqueeContainer is null)
-        {
             return;
-        }
         
         // Clip the marquee within its bounds
         _marqueeContainer.Clip = new RectangleGeometry
@@ -99,9 +104,7 @@ private void Container_SizeChanged(object sender, SizeChangedEventArgs e)
     private void Segment_SizeChanged(object sender, SizeChangedEventArgs e)
     {
         if (_segment1 is null)
-        {
             return;
-        }
 
         // If the segment size changes, we need to update the storyboard,
         // and seek to the correct position to maintain a smooth animation.
diff --git a/components/Marquee/src/Marquee.cs b/components/Marquee/src/Marquee.cs
index 0f054c308..6f8aab5b2 100644
--- a/components/Marquee/src/Marquee.cs
+++ b/components/Marquee/src/Marquee.cs
@@ -61,6 +61,14 @@ public Marquee()
         DefaultStyleKey = typeof(Marquee);
     }
 
+    /// <summary>
+    /// Unsubscribes from the loaded event when the control is being disposed.
+    /// </summary>
+    ~Marquee()
+    {
+        Loaded -= this.Marquee_Loaded;
+    }
+
     /// <inheritdoc/>
     protected override void OnApplyTemplate()
     {
@@ -72,12 +80,10 @@ protected override void OnApplyTemplate()
         _segment2 = (ContentPresenter)GetTemplateChild(Segment2PartName);
         _marqueeTransform = (TranslateTransform)GetTemplateChild(MarqueeTransformPartName);
 
-        _marqueeContainer.SizeChanged += Container_SizeChanged;
-        _segment1.SizeChanged += Segment_SizeChanged;
-
         // Swapping tabs in TabView caused errors where the control would unload and never reattach events.
-        // Hotfix: Track the loaded event. This should be fine because the GC will handle detaching the Loaded
-        // event on disposal. However, more research is required
+        // Fix: Track the loaded event. This should be fine because the GC will handle detaching the Loaded
+        // event on disposal. However, more research is required.
+        // As a result, all other events should be attached in the Loaded event handler.
         Loaded += this.Marquee_Loaded;
 
         VisualStateManager.GoToState(this, GetVisualStateName(Direction), false);
@@ -192,7 +198,7 @@ private void PlayMarquee(bool fromStart = false)
         }
 
         // Do nothing if storyboard is null or already playing and not from start.
-        if (_marqueeStoryboard is null || _isActive && !fromStart)
+        if (_marqueeStoryboard is null || (_isActive && !fromStart))
             return;
 
         bool wasActive = _isActive;
@@ -269,6 +275,12 @@ private bool UpdateAnimation(out TimeSpan seekPoint)
         if (!HasTemplateParts())
             return false;
 
+        // Unbind events from the old storyboard
+        if (_marqueeStoryboard is not null)
+        {
+            _marqueeStoryboard.Completed -= StoryBoard_Completed;
+        }
+
         // Get the size of the container and segment, based on the orientation.
         // Also track the property to adjust, also based on the orientation.
         double containerSize;
@@ -326,6 +338,7 @@ private bool UpdateAnimation(out TimeSpan seekPoint)
         // If the distance is zero, don't play an animation
         if (distance is 0)
         {
+            _marqueeStoryboard = null;
             return false;
         }
 
@@ -341,12 +354,6 @@ private bool UpdateAnimation(out TimeSpan seekPoint)
         // Calculate the animation duration by dividing the distance by the speed
         TimeSpan duration = TimeSpan.FromSeconds(distance / Speed);
 
-        // Unbind events from the old storyboard
-        if (_marqueeStoryboard is not null)
-        {
-            _marqueeStoryboard.Completed -= StoryBoard_Completed;
-        }
-
         // Create new storyboard and animation
         _marqueeStoryboard = CreateMarqueeStoryboardAnimation(start, end, duration, targetProperty);
 

From 4b2ef297ddc141d162e8fb025c9a5b6888645acd Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Wed, 24 Sep 2025 08:01:16 +0300
Subject: [PATCH 4/7] Fixed bugs on Marquee loaded and in updating a marquee
 animation on the fly

---
 components/Marquee/src/Marquee.Events.cs |  9 +++++++++
 components/Marquee/src/Marquee.cs        | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/components/Marquee/src/Marquee.Events.cs b/components/Marquee/src/Marquee.Events.cs
index fed5509de..1343bd201 100644
--- a/components/Marquee/src/Marquee.Events.cs
+++ b/components/Marquee/src/Marquee.Events.cs
@@ -55,6 +55,15 @@ private void Marquee_Loaded(object sender, RoutedEventArgs e)
         {
             _marqueeStoryboard.Completed += StoryBoard_Completed;
         }
+
+        // Setup the animation
+        UpdateMarquee(false);
+
+        // The marquee should run when loaded if auto play is enabled
+        if (AutoPlay)
+        {
+            StartMarquee();
+        }
     }
 
     private void Marquee_Unloaded(object sender, RoutedEventArgs e)
diff --git a/components/Marquee/src/Marquee.cs b/components/Marquee/src/Marquee.cs
index 6f8aab5b2..c610076c2 100644
--- a/components/Marquee/src/Marquee.cs
+++ b/components/Marquee/src/Marquee.cs
@@ -53,6 +53,12 @@ public partial class Marquee : ContentControl
     private bool _isActive = false;
     private bool _isPaused = false;
 
+    // This is used to track the position when stopped.
+    // If the animation update happens while running, this position
+    // is lost and must be set when the animation stops.
+    private double _stoppedPosition;
+    private DependencyProperty? _animationProperty;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="Marquee"/> class.
     /// </summary>
@@ -180,6 +186,12 @@ public void StopMarquee()
         _isActive = false;
         _isPaused = false;
 
+        // Set the transform to the stopped position if provided.
+        if (_animationProperty is not null)
+        {
+            _marqueeTransform?.SetValue(_animationProperty, _stoppedPosition);
+        }
+
         if (!wasStopped)
         {
             // Apply state transitions
@@ -380,6 +392,11 @@ private bool UpdateAnimation(out TimeSpan seekPoint)
             _marqueeTransform.SetValue(dp, start);
         }
 
+        // Set stopped position and animation property regardless of the active state.
+        // This will be used when the animation stops.
+        _stoppedPosition = start;
+        _animationProperty = dp;
+
         return true;
     }
 

From 61ca149aac3657577f62bdc35c2bb404aa177454 Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Thu, 25 Sep 2025 13:36:58 +0300
Subject: [PATCH 5/7] Fixed dependencies for Uno

---
 components/Marquee/samples/Dependencies.props  |  8 ++++----
 .../Marquee/samples/MarqueeBehaviorSample.xaml |  8 ++++----
 .../Marquee/samples/MarqueeText.Samples.csproj | 18 ------------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/components/Marquee/samples/Dependencies.props b/components/Marquee/samples/Dependencies.props
index e622e1df4..b0471fc89 100644
--- a/components/Marquee/samples/Dependencies.props
+++ b/components/Marquee/samples/Dependencies.props
@@ -11,21 +11,21 @@
 <Project>
     <!-- WinUI 2 / UWP -->
     <ItemGroup Condition="'$(IsUwp)' == 'true'">
-        <!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
+         <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250402"/> 
     </ItemGroup>
 
     <!-- WinUI 2 / Uno -->
     <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
-        <!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
+         <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Behaviors" Version="7.1.11"/> 
     </ItemGroup>
 
     <!-- WinUI 3 / WinAppSdk -->
     <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-        <!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
+         <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402"/> 
     </ItemGroup>
     
     <!-- WinUI 3 / Uno -->
     <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
-        <!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
+         <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Behaviors" Version="7.1.204"/> 
     </ItemGroup>
 </Project>
diff --git a/components/Marquee/samples/MarqueeBehaviorSample.xaml b/components/Marquee/samples/MarqueeBehaviorSample.xaml
index bfcf6071d..57fd9347a 100644
--- a/components/Marquee/samples/MarqueeBehaviorSample.xaml
+++ b/components/Marquee/samples/MarqueeBehaviorSample.xaml
@@ -1,8 +1,8 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="MarqueeExperiment.Samples.MarqueeBehaviorSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
       xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
@@ -10,7 +10,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d">
 
-    <StackPanel Padding="16">
+    <win:StackPanel Padding="16">
         <TextBlock FontWeight="Bold"
                    Text="This Marquee will loop once when hovered." />
         <controls:Marquee x:Name="Loop1Marquee"
@@ -52,5 +52,5 @@
                 </interactivity:EventTriggerBehavior>
             </interactivity:Interaction.Behaviors>
         </controls:Marquee>
-    </StackPanel>
+    </win:StackPanel>
 </Page>
diff --git a/components/Marquee/samples/MarqueeText.Samples.csproj b/components/Marquee/samples/MarqueeText.Samples.csproj
index ae8594845..f8450ff12 100644
--- a/components/Marquee/samples/MarqueeText.Samples.csproj
+++ b/components/Marquee/samples/MarqueeText.Samples.csproj
@@ -6,23 +6,5 @@
 
   <!-- Sets this up as a toolkit component's sample project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Compile Update="MarqueeBehaviorSampl.xaml.cs">
-      <DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="MarqueeBehaviorSample.xaml.cs">
-      <DependentUpon>MarqueeBehaviorSample.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="MarqueeTextSample.xaml.cs">
-      <DependentUpon>MarqueeTextSample.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="MarqueeSample.xaml.cs">
-      <DependentUpon>MarqueeSample.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
   
 </Project>

From 42442129cf48db4c37fdb9a6bfab87c106c75a16 Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Thu, 25 Sep 2025 13:58:18 +0300
Subject: [PATCH 6/7] Applied xaml styling

---
 components/Marquee/samples/MarqueeBehaviorSample.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/Marquee/samples/MarqueeBehaviorSample.xaml b/components/Marquee/samples/MarqueeBehaviorSample.xaml
index 57fd9347a..e9f3b53be 100644
--- a/components/Marquee/samples/MarqueeBehaviorSample.xaml
+++ b/components/Marquee/samples/MarqueeBehaviorSample.xaml
@@ -1,13 +1,13 @@
-<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <Page x:Class="MarqueeExperiment.Samples.MarqueeBehaviorSample"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:CommunityToolkit.WinUI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
       xmlns:local="MarqueeExperiment.Samples"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       mc:Ignorable="d">
 
     <win:StackPanel Padding="16">

From e34e9eb05a57af9464266450020a45db98678dec Mon Sep 17 00:00:00 2001
From: Adam Dernis <Avid29@Live.com>
Date: Thu, 25 Sep 2025 14:40:32 +0300
Subject: [PATCH 7/7] Fixed Marquee for UWP

---
 components/Marquee/src/Marquee.cs | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/components/Marquee/src/Marquee.cs b/components/Marquee/src/Marquee.cs
index c610076c2..dcba7b1ee 100644
--- a/components/Marquee/src/Marquee.cs
+++ b/components/Marquee/src/Marquee.cs
@@ -239,7 +239,7 @@ private void PlayMarquee(bool fromStart = false)
     private void UpdateMarquee(bool onTheFly)
     {
         // Check for crucial template parts
-        if(!HasTemplateParts())
+        if (_marqueeTransform is null)
             return;
 
         // If the update cannot be made on the fly,
@@ -278,14 +278,21 @@ private void UpdateMarquee(bool onTheFly)
     /// <param name="seekPoint">The seek point to resume the animation (if possible or appropriate.</param>
     /// <exception cref="InvalidOperationException">Thrown when template parts are not supplied.</exception>
     /// <returns>Returns whether or not an animation is neccesary.</returns>
-    [MemberNotNullWhen(true, nameof(_marqueeStoryboard))]
     private bool UpdateAnimation(out TimeSpan seekPoint)
     {
         seekPoint = TimeSpan.Zero;
 
         // Check for crucial template parts
-        if (!HasTemplateParts())
+        if (_marqueeContainer is null ||
+            _marqueeTransform is null ||
+            _segment1 is null ||
+            _segment2 is null)
+        {
+            // Crucial template parts are missing!
+            // This can happen during initialization of certain properties.
+            // Gracefully return when this happens. Proper checks for these template parts happen in OnApplyTemplate.
             return false;
+        }
 
         // Unbind events from the old storyboard
         if (_marqueeStoryboard is not null)
@@ -447,21 +454,4 @@ private Storyboard CreateMarqueeStoryboardAnimation(double start, double end, Ti
 
         return marqueeStoryboard;
     }
-
-    [MemberNotNullWhen(true, nameof(_marqueeContainer), nameof(_marqueeTransform), nameof(_segment1), nameof(_segment2))]
-    private bool HasTemplateParts()
-    {
-        if (_marqueeContainer is null ||
-            _marqueeTransform is null ||
-            _segment1 is null ||
-            _segment2 is null)
-        {
-            // Crucial template parts are missing!
-            // This can happen during initialization of certain properties.
-            // Gracefully return when this happens. Proper checks for these template parts happen in OnApplyTemplate.
-            return false;
-        }
-
-        return true;
-    }
 }