From 95525fcdbbf44362df1166be21416775ad9a0c26 Mon Sep 17 00:00:00 2001 From: Dong Bin Date: Thu, 27 Feb 2025 16:09:06 +0800 Subject: [PATCH] fix: fix nullable issue and switch fallback issue in marquee. --- src/Ursa/Controls/Marquee/Marquee.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Ursa/Controls/Marquee/Marquee.cs b/src/Ursa/Controls/Marquee/Marquee.cs index 4208db0..43c1f17 100644 --- a/src/Ursa/Controls/Marquee/Marquee.cs +++ b/src/Ursa/Controls/Marquee/Marquee.cs @@ -124,14 +124,14 @@ public class Marquee : ContentControl set => SetValue(SpeedProperty, value); } - private void OnPresenterSizeChanged(object sender, SizeChangedEventArgs e) + private void OnPresenterSizeChanged(object? sender, SizeChangedEventArgs e) { InvalidatePresenterPosition(); } - private void TimerOnTick(object sender, System.EventArgs e) + private void TimerOnTick(object? sender, System.EventArgs e) { if (Presenter is null) return; var layoutValues = Dispatcher.UIThread.Invoke(GetLayoutValues); @@ -177,11 +177,13 @@ public class Marquee : ContentControl { Direction.Up or Direction.Down => GetHorizontalOffset(values.Bounds, values.PresenterSize, values.HorizontalAlignment), Direction.Left or Direction.Right => values.Left, + _ => throw new NotImplementedException(), }; var verticalOffset = values.Direction switch { Direction.Up or Direction.Down => values.Top, Direction.Left or Direction.Right => GetVerticalOffset(values.Bounds, values.PresenterSize, values.VerticalAlignment), + _ => throw new NotImplementedException(), }; if (horizontalOffset is double.NaN) horizontalOffset = 0.0; if (verticalOffset is double.NaN) verticalOffset = 0.0;