chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix nullable issue and switch fallback issue in marquee.

Browse Source
This commit is contained in:
Dong Bin
2025-02-27 16:09:06 +08:00
parent 68065b216e
commit 95525fcdbb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ursa/Controls/Marquee/Marquee.cs
View File

@@ -124,14 +124,14 @@ public class Marquee : ContentControl
set => SetValue(SpeedProperty, value); set => SetValue(SpeedProperty, value);
} }
private void OnPresenterSizeChanged(object sender, SizeChangedEventArgs e) private void OnPresenterSizeChanged(object? sender, SizeChangedEventArgs e)
{ {
InvalidatePresenterPosition(); InvalidatePresenterPosition();
} }
private void TimerOnTick(object sender, System.EventArgs e) private void TimerOnTick(object? sender, System.EventArgs e)
{ {
if (Presenter is null) return; if (Presenter is null) return;
var layoutValues = Dispatcher.UIThread.Invoke(GetLayoutValues); 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.Up or Direction.Down => GetHorizontalOffset(values.Bounds, values.PresenterSize, values.HorizontalAlignment),
Direction.Left or Direction.Right => values.Left, Direction.Left or Direction.Right => values.Left,
_ => throw new NotImplementedException(),
}; };
var verticalOffset = values.Direction switch var verticalOffset = values.Direction switch
{ {
Direction.Up or Direction.Down => values.Top, Direction.Up or Direction.Down => values.Top,
Direction.Left or Direction.Right => GetVerticalOffset(values.Bounds, values.PresenterSize, values.VerticalAlignment), Direction.Left or Direction.Right => GetVerticalOffset(values.Bounds, values.PresenterSize, values.VerticalAlignment),
_ => throw new NotImplementedException(),
}; };
if (horizontalOffset is double.NaN) horizontalOffset = 0.0; if (horizontalOffset is double.NaN) horizontalOffset = 0.0;
if (verticalOffset is double.NaN) verticalOffset = 0.0; if (verticalOffset is double.NaN) verticalOffset = 0.0;