Merge branch 'hotfix/5.3.1'

Author: GeertvanHorrik

src/Orc.Controls.Example/ViewModels/AnimatedGifViewModel.cs

@@ -4,10 +4,8 @@
 
     public class AnimatedGifViewModel : ViewModelBase
     {
-        #region Constructors
         public AnimatedGifViewModel()
         {
         }
-        #endregion
     }
 }

src/Orc.Controls.Example/ViewModels/AnimatedTextBlockViewModel.cs

@@ -0,0 +1,48 @@
+namespace Orc.Controls.Example.ViewModels
+{
+    using System;
+    using System.Threading.Tasks;
+    using Catel.MVVM;
+    using Catel.Services;
+    using Catel.Windows.Threading;
+
+    public class AnimatedTextBlockViewModel : ViewModelBase
+    {
+        private DispatcherTimerEx _dispatcherTimerEx;
+        private readonly Random _random = new Random();
+
+        private int _currentIndex;
+
+        public AnimatedTextBlockViewModel(IDispatcherService dispatcherService)
+        {
+            _dispatcherTimerEx = new DispatcherTimerEx(dispatcherService);
+        }
+
+        public string Status { get; private set; }
+
+        protected override Task InitializeAsync()
+        {
+            _dispatcherTimerEx.Tick += OnDispatcherTimerTick;
+            _dispatcherTimerEx.Start();
+
+            return base.InitializeAsync();
+        }
+
+        protected override Task CloseAsync()
+        {
+            _dispatcherTimerEx.Tick -= OnDispatcherTimerTick;
+            _dispatcherTimerEx.Stop();
+
+            return base.CloseAsync();
+        }
+
+        private void OnDispatcherTimerTick(object sender, EventArgs e)
+        {
+            _dispatcherTimerEx.Stop();
+            _dispatcherTimerEx.Interval = TimeSpan.FromMilliseconds(_random.Next(100, 5000));
+            _dispatcherTimerEx.Start();
+
+            Status = $"Status {1 + _currentIndex++}";
+        }
+    }
+}

src/Orc.Controls.Example/Views/AnimatedTextBlock.xaml

@@ -0,0 +1,17 @@
+<catel:UserControl x:Class="Orc.Controls.Example.Views.AnimatedTextBlock"
+                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                   xmlns:catel="http://schemas.catelproject.com"
+                   xmlns:orccontrols="http://schemas.wildgums.com/orc/controls">
+
+    <StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="AnimatedTextBlock"
+                       VerticalAlignment="Center"
+                       Width="150" />
+            <orccontrols:AnimatingTextBlock HorizontalAlignment="Center"
+                                            Text="{Binding Status}" />
+        </StackPanel>
+    </StackPanel>
+
+</catel:UserControl>

src/Orc.Controls.Example/Views/AnimatedTextBlock.xaml.cs

@@ -0,0 +1,10 @@
+namespace Orc.Controls.Example.Views
+{
+    public partial class AnimatedTextBlock
+    {
+        public AnimatedTextBlock()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/Orc.Controls.Example/Views/MainWindow.xaml

@@ -50,6 +50,10 @@
                     <views:AnimatedGif />
                 </TabItem>
 
+                <TabItem Header="AnimatedTextBlock">
+                    <views:AnimatedTextBlock />
+                </TabItem>
+
                 <TabItem Header="BindableRichTextBox">
                     <views:BindableRichTextBox />
                 </TabItem>

src/Orc.Controls.Tests/PublicApiFacts.Orc_Controls_HasNoBreakingChanges_Async.verified.txt

@@ -53,15 +53,20 @@ namespace Orc.Controls
         public string GifSource { get; set; }
         protected override System.Windows.Automation.Peers.AutomationPeer OnCreateAutomationPeer() { }
     }
+    [System.Windows.StyleTypedProperty(Property="TextBlockStyle", StyleTargetType=typeof(System.Windows.Controls.TextBlock))]
     public class AnimatingTextBlock : System.Windows.Controls.UserControl, Orc.Controls.Services.IStatusRepresenter
     {
         public static readonly System.Windows.DependencyProperty HideStoryboardProperty;
         public static readonly System.Windows.DependencyProperty ShowStoryboardProperty;
+        public static readonly System.Windows.DependencyProperty TextAlignmentProperty;
+        public static readonly System.Windows.DependencyProperty TextBlockStyleProperty;
         public static readonly System.Windows.DependencyProperty TextProperty;
         public AnimatingTextBlock() { }
         public System.Windows.Media.Animation.Storyboard? HideStoryboard { get; set; }
         public System.Windows.Media.Animation.Storyboard? ShowStoryboard { get; set; }
         public string Text { get; set; }
+        public System.Windows.TextAlignment TextAlignment { get; set; }
+        public System.Windows.Style? TextBlockStyle { get; set; }
         public override void OnApplyTemplate() { }
         protected override System.Windows.Automation.Peers.AutomationPeer OnCreateAutomationPeer() { }
         public void UpdateStatus(string status) { }

src/Orc.Controls/Controls/AnimatingTextBlock/AnimatingTextBlock.cs

@@ -6,19 +6,75 @@
 using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using Automation;
+using Catel.Logging;
 using Services;
 
+[StyleTypedProperty(Property = nameof(TextBlockStyle), StyleTargetType = typeof(TextBlock))]
 public class AnimatingTextBlock : UserControl, IStatusRepresenter
 {
+    private static readonly ILog Log = LogManager.GetCurrentClassLogger();
+
+    private static readonly Storyboard DefaultShowStoryboard;
+    private static readonly Storyboard DefaultHideStoryboard;
+
     private Grid? _contentGrid;
     private int _currentIndex = 0;
 
+    static AnimatingTextBlock()
+    {
+        var showStoryboard = new Storyboard();
+
+        var showAnimation = new DoubleAnimation
+        {
+            To = 1d,
+            Duration = TimeSpan.FromMilliseconds(500),
+            EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }
+        };
+
+        Storyboard.SetTargetProperty(showAnimation, new PropertyPath(nameof(TextBlock.Opacity)));
+
+        showStoryboard.Children.Add(showAnimation);
+
+        DefaultShowStoryboard = showStoryboard;
+
+        var hideStoryboard = new Storyboard();
+
+        var hideAnimation = new DoubleAnimation
+        {
+            To = 0d,
+            Duration = TimeSpan.FromMilliseconds(500),
+            EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }
+        };
+
+        Storyboard.SetTargetProperty(hideAnimation, new PropertyPath(nameof(TextBlock.Opacity)));
+
+        hideStoryboard.Children.Add(hideAnimation);
+
+        DefaultHideStoryboard = hideStoryboard;
+    }
+
     public AnimatingTextBlock()
     {
+        SetCurrentValue(ShowStoryboardProperty, DefaultShowStoryboard);
+        SetCurrentValue(HideStoryboardProperty, DefaultHideStoryboard);
+
         Loaded += OnLoaded;
     }
 
     #region Dependency properties
+
+
+    public Style? TextBlockStyle
+    {
+        get { return (Style?)GetValue(TextBlockStyleProperty); }
+        set { SetValue(TextBlockStyleProperty, value); }
+    }
+
+    public static readonly DependencyProperty TextBlockStyleProperty = DependencyProperty.Register(nameof(TextBlockStyle), 
+        typeof(Style), typeof(AnimatingTextBlock), new PropertyMetadata(null));
+
+
+
     public string Text
     {
         get { return (string)GetValue(TextProperty); }
@@ -27,15 +83,27 @@ public string Text
 
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(AnimatingTextBlock),
         new PropertyMetadata(string.Empty, (sender, _) => ((AnimatingTextBlock)sender).OnTextChanged()));
-        
+
+
+    public TextAlignment TextAlignment
+    {
+        get { return (TextAlignment)GetValue(TextAlignmentProperty); }
+        set { SetValue(TextAlignmentProperty, value); }
+    }
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register(nameof(TextAlignment), typeof(TextAlignment), 
+        typeof(AnimatingTextBlock), new PropertyMetadata(TextAlignment.Left));
+
+
     public Storyboard? HideStoryboard
     {
         get { return (Storyboard?)GetValue(HideStoryboardProperty); }
         set { SetValue(HideStoryboardProperty, value); }
     }      
 
     public static readonly DependencyProperty HideStoryboardProperty =
-        DependencyProperty.Register(nameof(HideStoryboard), typeof(Storyboard), typeof(AnimatingTextBlock), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(HideStoryboard), typeof(Storyboard), typeof(AnimatingTextBlock), new PropertyMetadata());
+
 
     public Storyboard? ShowStoryboard 
     {
@@ -44,7 +112,7 @@ public Storyboard? ShowStoryboard
     }    
 
     public static readonly DependencyProperty ShowStoryboardProperty =
-        DependencyProperty.Register(nameof(ShowStoryboard), typeof(Storyboard), typeof(AnimatingTextBlock), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(ShowStoryboard), typeof(Storyboard), typeof(AnimatingTextBlock), new PropertyMetadata());
 
     #endregion
 
@@ -97,7 +165,8 @@ private void OnHideStoryboardComplete(object? sender, EventArgs e)
 
     private void OnHideComplete()
     {
-        if (string.IsNullOrEmpty(Text))
+        var text = Text;
+        if (string.IsNullOrEmpty(text))
         {
             return;
         }
@@ -114,7 +183,7 @@ private void OnHideComplete()
         }
 
         var textBlockToShow = (TextBlock)_contentGrid.Children[_currentIndex];
-        textBlockToShow.SetCurrentValue(TextBlock.TextProperty, Text);
+        textBlockToShow.SetCurrentValue(TextBlock.TextProperty, text);
 
         var showStoryboard = ShowStoryboard;
         if (showStoryboard is not null)
@@ -162,16 +231,26 @@ private Grid CreateContent()
         var renderTransform = RenderTransform;
         SetCurrentValue(RenderTransformProperty, null);
 
+        var textBlockStyle = TextBlockStyle;
+
         for (var i = 0; i < 2; i++)
         {
             var textBlock = new TextBlock
             {
-                HorizontalAlignment = HorizontalAlignment.Left,
-                VerticalAlignment = VerticalAlignment.Center,
+                HorizontalAlignment = HorizontalContentAlignment,
+                VerticalAlignment = VerticalContentAlignment,
                 Opacity = 0d,
-                RenderTransform = renderTransform
+                RenderTransform = renderTransform,
+                TextAlignment = TextAlignment,
+                TextWrapping = TextWrapping.NoWrap,
+                TextTrimming = TextTrimming.CharacterEllipsis,
             };
 
+            if (textBlockStyle is not null)
+            {
+                textBlock.Style = textBlockStyle;
+            }
+
             grid.Children.Add(textBlock);
         }
 

src/Orc.Controls/Controls/BusyIndicator/VisualWrapper.cs

@@ -13,7 +13,7 @@ public class VisualWrapper : FrameworkElement
 {
     private Visual? _child;
 
-    /// <summary>w
+    /// <summary>
     /// Gets or sets the child.
     /// </summary>
     /// <value>The child.</value>