Improved MarqueeText control #548
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| <!-- 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="MarqueeTextExperiment.Samples.CustomStyleMarqueeTextSample" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:labs="using:CommunityToolkit.Labs.WinUI.MarqueeTextRns" | ||
| xmlns:local="MarqueeTextExperiment.Samples" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| mc:Ignorable="d"> | ||
|
|
||
| <StackPanel Padding="16"> | ||
| <labs:MarqueeText x:Name="Marquee" | ||
| Behavior="Cycle" | ||
| FontSize="18" | ||
| Text="{x:Bind MQText, Mode=OneWay}"> | ||
| <labs:MarqueeText.Style> | ||
| <Style TargetType="labs:MarqueeText"> | ||
| <Setter Property="IsTabStop" Value="False" /> | ||
| <Setter Property="VerticalAlignment" Value="Top" /> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="labs:MarqueeText"> | ||
| <Grid Padding="{TemplateBinding Padding}" | ||
| HorizontalAlignment="{TemplateBinding HorizontalAlignment}" | ||
| VerticalAlignment="{TemplateBinding VerticalAlignment}" | ||
| Background="{TemplateBinding Background}" | ||
| BorderBrush="{TemplateBinding BorderBrush}" | ||
| BorderThickness="{TemplateBinding BorderThickness}" | ||
| CornerRadius="{TemplateBinding CornerRadius}"> | ||
|
|
||
| <Grid.Resources> | ||
| <Storyboard x:Name="CyclingAnimation" | ||
| Duration="0:0:0.5"> | ||
| <!-- Animate out --> | ||
| <DoubleAnimationUsingKeyFrames x:Name="CycleAnimationTranslationAnimation" | ||
| Storyboard.TargetName="MarqueeTransform" | ||
| Storyboard.TargetProperty="(CompositeTransform.Rotation)" | ||
| Duration="0:0:1.2"> | ||
| <DiscreteDoubleKeyFrame KeyTime="0:0:0" | ||
| Value="0" /> | ||
| <LinearDoubleKeyFrame x:Name="CycleAnimationFadeOutPosition" | ||
| KeyTime="0:0:0.2" | ||
| Value="20" /> | ||
| <DiscreteDoubleKeyFrame x:Name="CycleAnimationFadeInPosition" | ||
| KeyTime="0:0:0.3" | ||
| Value="-20" /> | ||
| <LinearDoubleKeyFrame KeyTime="0:0:0.5" | ||
| Value="0" /> | ||
| </DoubleAnimationUsingKeyFrames> | ||
| <!-- Animate the opacity --> | ||
| <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MarqueePanel" | ||
| Storyboard.TargetProperty="(UIElement.Opacity)" | ||
| Duration="0:0:1.2"> | ||
| <DiscreteDoubleKeyFrame KeyTime="0:0:0" | ||
| Value="1" /> | ||
| <LinearDoubleKeyFrame KeyTime="0:0:0.2" | ||
| Value="0" /> | ||
| <DiscreteDoubleKeyFrame KeyTime="0:0:0.3" | ||
| Value="0" /> | ||
| <LinearDoubleKeyFrame KeyTime="0:0:0.5" | ||
| Value="1" /> | ||
| </DoubleAnimationUsingKeyFrames> | ||
| <!-- Toggle the visible segment between fade out and fade in --> | ||
| <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Segment2" | ||
| Storyboard.TargetProperty="(UIElement.Visibility)"> | ||
| <DiscreteObjectKeyFrame KeyTime="0:0:0" | ||
| Value="Visible" /> | ||
| <DiscreteObjectKeyFrame KeyTime="0:0:0.25" | ||
| Value="Collapsed" /> | ||
| </ObjectAnimationUsingKeyFrames> | ||
| <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Segment1" | ||
| Storyboard.TargetProperty="(UIElement.Visibility)"> | ||
| <DiscreteObjectKeyFrame KeyTime="0:0:0" | ||
| Value="Collapsed" /> | ||
| <DiscreteObjectKeyFrame KeyTime="0:0:0.25" | ||
| Value="Visible" /> | ||
| </ObjectAnimationUsingKeyFrames> | ||
| </Storyboard> | ||
| </Grid.Resources> | ||
| <VisualStateManager.VisualStateGroups> | ||
| <VisualStateGroup x:Name="MarqueeStateGroup"> | ||
| <VisualState x:Name="MarqueeActive" /> | ||
| <VisualState x:Name="MarqueeStopped"> | ||
| <VisualState.Setters> | ||
| <Setter Target="MarqueeTransform.TranslateX" Value="0.0" /> | ||
| <Setter Target="MarqueeTransform.TranslateY" Value="0.0" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| </VisualStateGroup> | ||
| <VisualStateGroup x:Name="DirectionStateGroup"> | ||
| <VisualState x:Name="Leftwards"> | ||
| <VisualState.Setters> | ||
| <Setter Target="MarqueePanel.Orientation" Value="Horizontal" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Rightwards"> | ||
| <VisualState.Setters> | ||
| <Setter Target="MarqueePanel.Orientation" Value="Horizontal" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Upwards"> | ||
| <VisualState.Setters> | ||
| <Setter Target="MarqueePanel.Orientation" Value="Vertical" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Downwards"> | ||
| <VisualState.Setters> | ||
| <Setter Target="MarqueePanel.Orientation" Value="Vertical" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| </VisualStateGroup> | ||
| <VisualStateGroup x:Name="BehaviorStateGroup"> | ||
| <VisualState x:Name="Ticker"> | ||
| <VisualState.Setters> | ||
| <Setter Target="Segment1.Padding" Value="0" /> | ||
| <Setter Target="Segment2.Visibility" Value="Collapsed" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Looping"> | ||
| <VisualState.Setters> | ||
| <Setter Target="Segment1.Padding" Value="0,0,32,0" /> | ||
| <Setter Target="Segment2.Visibility" Value="Collapsed" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Bouncing"> | ||
| <VisualState.Setters> | ||
| <Setter Target="Segment1.Padding" Value="0" /> | ||
| <Setter Target="Segment2.Visibility" Value="Collapsed" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| <VisualState x:Name="Cycle"> | ||
| <VisualState.Setters> | ||
| <Setter Target="Segment1.Padding" Value="0" /> | ||
| <Setter Target="Segment2.Visibility" Value="Collapsed" /> | ||
| </VisualState.Setters> | ||
| </VisualState> | ||
| </VisualStateGroup> | ||
| </VisualStateManager.VisualStateGroups> | ||
|
|
||
| <Grid x:Name="MarqueeContainer"> | ||
| <StackPanel x:Name="MarqueePanel" | ||
| Orientation="Horizontal" | ||
| RenderTransformOrigin="0,0.5"> | ||
| <StackPanel.RenderTransform> | ||
| <CompositeTransform x:Name="MarqueeTransform" /> | ||
| </StackPanel.RenderTransform> | ||
| <TextBlock x:Name="Segment1" | ||
| win:FontStretch="{TemplateBinding FontStretch}" | ||
| win:TextDecorations="{TemplateBinding TextDecorations}" | ||
| CharacterSpacing="{TemplateBinding CharacterSpacing}" | ||
| FontFamily="{TemplateBinding FontFamily}" | ||
| FontSize="{TemplateBinding FontSize}" | ||
| FontStyle="{TemplateBinding FontStyle}" | ||
| FontWeight="{TemplateBinding FontWeight}" | ||
| Foreground="{TemplateBinding Foreground}" | ||
| Text="{TemplateBinding Text}" /> | ||
| <TextBlock x:Name="Segment2" | ||
| win:FontStretch="{TemplateBinding FontStretch}" | ||
| win:TextDecorations="{TemplateBinding TextDecorations}" | ||
| CharacterSpacing="{TemplateBinding CharacterSpacing}" | ||
| FontFamily="{TemplateBinding FontFamily}" | ||
| FontSize="{TemplateBinding FontSize}" | ||
| FontStyle="{TemplateBinding FontStyle}" | ||
| FontWeight="{TemplateBinding FontWeight}" | ||
| Foreground="{TemplateBinding Foreground}" | ||
| Text="{TemplateBinding SecondaryText}" | ||
| Visibility="Collapsed" /> | ||
| </StackPanel> | ||
| </Grid> | ||
| </Grid> | ||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| </Style> | ||
| </labs:MarqueeText.Style> | ||
| </labs:MarqueeText> | ||
| </StackPanel> | ||
| </Page> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // 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. | ||
|
|
||
| using CommunityToolkit.Labs.WinUI.MarqueeTextRns; | ||
|
|
||
| namespace MarqueeTextExperiment.Samples; | ||
|
|
||
| [ToolkitSample(id: nameof(CustomStyleMarqueeTextSample), "MarqueeText", description: "A control for scrolling text in a marquee fashion.")] | ||
| [ToolkitSampleTextOption("MQText", LoremIpsum, Title = "Text")] | ||
| //[ToolkitSampleMultiChoiceOption("MarqueeRepeat", "Repeat", "Forever", "1x", "2x")] | ||
| public sealed partial class CustomStyleMarqueeTextSample : Page | ||
| { | ||
| private const string LoremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."; | ||
|
|
||
| public CustomStyleMarqueeTextSample() | ||
| { | ||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| private MarqueeDirection ConvertStringToMarqueeDirection(string str) => str switch | ||
|
There was a problem hiding this comment. Since the value of each string here matches the enum value name, we shouldn't need a converter. If this doesn't work, it's something we need to investigate fixing. |
||
| { | ||
| "Left" => MarqueeDirection.Left, | ||
| "Up" => MarqueeDirection.Up, | ||
| "Right" => MarqueeDirection.Right, | ||
| "Down" => MarqueeDirection.Down, | ||
| _ => throw new System.NotImplementedException(), | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might be an area to improve our tooling --
ToolkitSampleTextOptionshould take a default value for the text.