diff --git a/src/AtomUI.Controls/TabControl/TabControlTheme.cs b/src/AtomUI.Controls/TabControl/TabControlTheme.cs index cb440e045..25564db5e 100644 --- a/src/AtomUI.Controls/TabControl/TabControlTheme.cs +++ b/src/AtomUI.Controls/TabControl/TabControlTheme.cs @@ -65,7 +65,7 @@ internal class TabControlTheme : BaseTabControlTheme layout.Children.Add(border); CreateTemplateParentBinding(itemsPresenter, ItemsPresenter.ItemsPanelProperty, ItemsControl.ItemsPanelProperty); return layout; - } + } protected override void BuildStyles() { diff --git a/src/AtomUI.Controls/Utils/AnimationUtils.cs b/src/AtomUI.Controls/Utils/AnimationUtils.cs index ff3abb96e..b1c8f057a 100644 --- a/src/AtomUI.Controls/Utils/AnimationUtils.cs +++ b/src/AtomUI.Controls/Utils/AnimationUtils.cs @@ -1,9 +1,9 @@ -using AtomUI.Theme.Styling; +using System.Diagnostics; +using AtomUI.Theme.Styling; using AtomUI.Theme.TokenSystem; using Avalonia; using Avalonia.Animation; using Avalonia.Animation.Easings; -using Avalonia.Controls; namespace AtomUI.Controls.Utils; @@ -22,11 +22,15 @@ public sealed class AnimationUtils : AtomUI.Utils.AnimationUtils Easing = easing }; var application = Application.Current; - if (application is not null) + Debug.Assert(application != null); + var themeVariant = application.ActualThemeVariant; + if (application.TryGetResource(durationResourceKey, themeVariant, out var value)) { - transition.Bind(TransitionBase.DurationProperty, application.GetResourceObservable(durationResourceKey)); + if (value is TimeSpan duration) + { + transition.Duration = duration; + } } - return transition; } } \ No newline at end of file