Merge branch 'main' into niels9001/per-heading-foreground

Author: niels9001

ReadMe.md

@@ -28,7 +28,7 @@ Otherwise, you can clone the repo, open the `components` directory, navigate wit
 - [DataTable](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/DataTable/samples/DataTable.md)
 - [Extensions.DependencyInjection](https://github.com/CommunityToolkit/Labs-Windows/tree/main/components/Extensions.DependencyInjection)
 - [MarkdownTextBlock](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/MarkdownTextBlock/samples/MarkdownTextBlock.md)
-- [MarqueeText](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/MarqueeText/samples/MarqueeText.md)
+- [Marquee](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/Marquee/samples/Marquee.md)
 - [Notifications](https://github.com/CommunityToolkit/Labs-Windows/tree/main/components/Notifications)
 - [Ribbon](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/Ribbon/samples/Ribbon.md)
 - [RivePlayer](https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/RivePlayer/samples/RivePlayer.md)

components/MarkdownTextBlock/src/HtmlWriter.cs

@@ -36,7 +36,13 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                         var myHyperlinkButton = new MyHyperlinkButton(node, renderer.Config.BaseUrl);
                         myHyperlinkButton.ClickEvent += (sender, e) =>
                         {
-                            renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);
+                            var button = (HyperlinkButton)sender;
+                            var uri = button.NavigateUri;
+                            var handled = renderer.MarkdownTextBlock.RaiseLinkClickedEvent(uri);
+                            if (handled)
+                            {
+                                button.NavigateUri = null;
+                            }
                         };
                         hyperLink = myHyperlinkButton;
                     }
@@ -46,7 +52,12 @@ public static void WriteHtml(WinUIRenderer renderer, HtmlNodeCollection nodes)
                         myHyperlink.TextElement.Foreground = renderer.Config.Themes.LinkForeground;
                         myHyperlink.ClickEvent += (sender, e) =>
                         {
-                            renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
+                            var uri = sender.NavigateUri;
+                            var handled = renderer.MarkdownTextBlock.RaiseLinkClickedEvent(uri);
+                            if (handled)
+                            {
+                                sender.NavigateUri = null;
+                            }
                         };
                         hyperLink = myHyperlink;
                     }

components/MarkdownTextBlock/src/LinkClickedEventArgs.cs

@@ -7,6 +7,10 @@ namespace CommunityToolkit.WinUI.Controls;
 public class LinkClickedEventArgs : EventArgs
 {
     public Uri Uri { get; }
+    /// <summary>
+    /// Set to true in your handler to indicate the link click was handled and default navigation should be suppressed.
+    /// </summary>
+    public bool Handled { get; set; }
 
     public LinkClickedEventArgs(Uri uri)
     {

components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs

@@ -23,7 +23,16 @@ public partial class MarkdownTextBlock : Control
 
     public event EventHandler<LinkClickedEventArgs>? OnLinkClicked;
 
-    internal void RaiseLinkClickedEvent(Uri uri) => OnLinkClicked?.Invoke(this, new LinkClickedEventArgs(uri));
+    internal bool RaiseLinkClickedEvent(Uri uri)
+    {
+        if (OnLinkClicked == null)
+        {
+            return false;
+        }
+        var args = new LinkClickedEventArgs(uri);
+        OnLinkClicked?.Invoke(this, args);
+        return args.Handled;
+    }
 
     private static void OnConfigChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {

components/MarkdownTextBlock/src/Renderers/ObjectRenderers/Inlines/LinkInlineRenderer.cs

@@ -33,7 +33,15 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
                 var myHyperlinkButton = new MyHyperlinkButton(link, renderer.Config.BaseUrl);
                 myHyperlinkButton.ClickEvent += (sender, e) =>
                 {
-                    renderer.MarkdownTextBlock.RaiseLinkClickedEvent(((HyperlinkButton)sender).NavigateUri);
+                    var button = (HyperlinkButton)sender;
+                    var uri = button.NavigateUri;
+                    var handled = renderer.MarkdownTextBlock.RaiseLinkClickedEvent(uri);
+                    if (handled)
+                    {
+                        // Suppress default navigation by clearing NavigateUri just for this invocation
+                        button.NavigateUri = null;
+                        // Optionally restore later; not needed unless reused.
+                    }
                 };
                 // Apply link foreground to nested RichTextBlock content
                 // (Handled in MyHyperlinkButton initialization via MarkdownConfig.Default for now)
@@ -45,7 +53,13 @@ protected override void Write(WinUIRenderer renderer, LinkInline link)
                 hyperlink.TextElement.Foreground = renderer.Config.Themes.LinkForeground;
                 hyperlink.ClickEvent += (sender, e) =>
                 {
-                    renderer.MarkdownTextBlock.RaiseLinkClickedEvent(sender.NavigateUri);
+                    var uri = sender.NavigateUri;
+                    var handled = renderer.MarkdownTextBlock.RaiseLinkClickedEvent(uri);
+                    if (handled)
+                    {
+                        // Suppress navigation by clearing NavigateUri
+                        sender.NavigateUri = null;
+                    }
                 };
 
                 renderer.Push(hyperlink);

components/MarqueeText/OpenSolution.bat renamed to components/Marquee/OpenSolution.bat

@@ -0,0 +1,52 @@
+---
+title: Marquee
+author: Avid29
+description: A control for scrolling content in a marquee fashion.
+keywords: Marquee, Control
+dev_langs:
+  - csharp
+category: Controls
+subcategory: Layout
+experimental: true
+discussion-id: 231 
+issue-id: 426
+icon: Assets/Marquee.png
+---
+
+The Marquee control allows text or other content to scroll in a marquee fashion. The control is heavily templated and many changes can be made by modifying the style. The control can also be adjusted using the Speed, Behavior, RepeatBehavior, and Direction properties.
+
+## Speed
+
+The speed property determines how quickly the content moves in pixels per second. The speed can be adjusted mid-animation and handled continously.
+
+## Behavior
+
+The Marquee control has 3 behaviors
+
+### Ticker
+
+Ticker mode starts with all content off the screen then scrolls the content across across the screen. When the animation finishes in the mode no content will be on screen.
+
+### Looping
+
+Looping mode will begin with the start of the content fully in frame then scroll towards the end. When the end is reached it will loop back to the start of the content. Nothing will happen if the content fits in frame.
+
+### Bouncing
+
+Looping mode will begin with the start of the content fully in frame then scroll towards the end. When the end is reached it will bounce and scroll backwards to the start of the content. Nothing will happen if the content fits in frame.
+
+## RepeatBehavior
+
+The repeat behavior determines how many times the marquee will loop before the animation finishes. It can be a number of iteration, a duration, or forever.
+
+## Direction
+
+The default direction is left, meaning the content will move leftwards, but this can be changed to right, up, or down. Direction changed between left and right or up and down are handled continously, meaning that the animation will resume from its current position if changed between these directions.
+
+> [!Sample MarqueeTextSample]
+
+## Non-Text Content
+
+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]

components/MarqueeText/samples/Assets/MarqueeText.png renamed to components/Marquee/samples/Assets/Marquee.png

@@ -0,0 +1,44 @@
+<!--  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"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:MarqueeExperiment.Samples"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
+
+    <StackPanel Padding="16">
+        <controls:Marquee Behavior="{x:Bind ConvertStringToMarqueeBehavior(MQBehavior), Mode=OneWay}"
+                          Content="{x:Bind Data}"
+                          Direction="{x:Bind ConvertStringToMarqueeDirection(MQDirection), Mode=OneWay}"
+                          FontSize="18"
+                          RepeatBehavior="Forever"
+                          Speed="{x:Bind MQSpeed, Mode=OneWay}">
+            <controls:Marquee.ContentTemplate>
+                <DataTemplate x:DataType="local:MarqueeSampleItems">
+                    <ItemsControl ItemsSource="{x:Bind Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal"
+                                            Spacing="8" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate x:DataType="local:MarqueeSampleItem">
+                                <Border Width="100"
+                                        Height="48"
+                                        Background="{x:Bind Brush}">
+                                    <TextBlock Text="{x:Bind Name}" />
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </DataTemplate>
+            </controls:Marquee.ContentTemplate>
+        </controls:Marquee>
+
+        <Button Click="AddItem_Click"
+                Content="Add something" />
+    </StackPanel>
+</Page>