From bdb59c0335c432ef14c0da54dc64fd2c430567d8 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 31 Jul 2024 00:47:50 +0800 Subject: [PATCH] feat: update dependency, replace obsoleted math utilities. --- src/Ursa/Controls/ElasticWrapPanel.cs | 13 +++++++------ src/Ursa/Controls/IPv4Box.cs | 2 +- src/Ursa/Controls/RangeSlider/RangeSlider.cs | 12 ++++++------ src/Ursa/Controls/TagInput/TagInputPanel.cs | 6 +++--- src/Ursa/Ursa.csproj | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Ursa/Controls/ElasticWrapPanel.cs b/src/Ursa/Controls/ElasticWrapPanel.cs index cf799df..b971709 100644 --- a/src/Ursa/Controls/ElasticWrapPanel.cs +++ b/src/Ursa/Controls/ElasticWrapPanel.cs @@ -2,6 +2,7 @@ using Avalonia.Controls; using Avalonia.Layout; using Avalonia.Utilities; +using Irihi.Avalonia.Shared.Helpers; using static System.Math; namespace Ursa.Controls; @@ -132,7 +133,7 @@ public class ElasticWrapPanel : WrapPanel sz.V = itemSetSize.V; } - if (MathUtilities.GreaterThan(curLineSize.U + sz.U, uvConstraint.U)) + if (MathHelpers.GreaterThan(curLineSize.U + sz.U, uvConstraint.U)) { panelSize.U = Max(curLineSize.U, panelSize.U); panelSize.V += curLineSize.V; @@ -158,13 +159,13 @@ public class ElasticWrapPanel : WrapPanel itemWidthSet ? itemWidth : child.DesiredSize.Width, itemHeightSet ? itemHeight : child.DesiredSize.Height); - if (MathUtilities.GreaterThan(curLineSize.U + sz.U, uvConstraint.U)) // Need to switch to another line + if (MathHelpers.GreaterThan(curLineSize.U + sz.U, uvConstraint.U)) // Need to switch to another line { panelSize.U = Max(curLineSize.U, panelSize.U); panelSize.V += curLineSize.V; curLineSize = sz; - if (MathUtilities.GreaterThan(sz.U, uvConstraint.U)) // The element is wider than the constraint - give it a separate line + if (MathHelpers.GreaterThan(sz.U, uvConstraint.U)) // The element is wider than the constraint - give it a separate line { panelSize.U = Max(sz.U, panelSize.U); panelSize.V += sz.V; @@ -236,7 +237,7 @@ public class ElasticWrapPanel : WrapPanel sz.V = itemSetSize.V; } - if (MathUtilities.GreaterThan(curLineUIs.TotalU + sz.U, uvFinalSize.U)) + if (MathHelpers.GreaterThan(curLineUIs.TotalU + sz.U, uvFinalSize.U)) { if (curLineUIs.Count > 0) { @@ -260,7 +261,7 @@ public class ElasticWrapPanel : WrapPanel itemWidthSet ? ItemWidth : child.DesiredSize.Width, itemHeightSet ? ItemHeight : child.DesiredSize.Height); - if (MathUtilities.GreaterThan(curLineUIs.TotalU + sz.U, uvFinalSize.U)) // Need to switch to another line + if (MathHelpers.GreaterThan(curLineUIs.TotalU + sz.U, uvFinalSize.U)) // Need to switch to another line { if (curLineUIs.Count > 0) { @@ -269,7 +270,7 @@ public class ElasticWrapPanel : WrapPanel curLineUIs = new UVCollection(Orientation, itemSetSize); curLineUIs.Add(child, sz); - if (MathUtilities.GreaterThan(sz.U, uvFinalSize.U)) + if (MathHelpers.GreaterThan(sz.U, uvFinalSize.U)) { lineUVCollection.Add(curLineUIs); curLineUIs = new UVCollection(Orientation, itemSetSize); diff --git a/src/Ursa/Controls/IPv4Box.cs b/src/Ursa/Controls/IPv4Box.cs index b0e75ba..cb1d2e8 100644 --- a/src/Ursa/Controls/IPv4Box.cs +++ b/src/Ursa/Controls/IPv4Box.cs @@ -540,7 +540,7 @@ public class IPv4Box: TemplatedControl IClipboard? clipboard = TopLevel.GetTopLevel(this)?.Clipboard; if (clipboard is null) return; var s = await clipboard.GetTextAsync(); - if (IPAddress.TryParse(s, out var address)) + if (s is not null && IPAddress.TryParse(s, out var address)) { IPAddress = address; } diff --git a/src/Ursa/Controls/RangeSlider/RangeSlider.cs b/src/Ursa/Controls/RangeSlider/RangeSlider.cs index 533724a..8244910 100644 --- a/src/Ursa/Controls/RangeSlider/RangeSlider.cs +++ b/src/Ursa/Controls/RangeSlider/RangeSlider.cs @@ -7,7 +7,7 @@ using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Layout; -using Avalonia.Utilities; +using Irihi.Avalonia.Shared.Helpers; namespace Ursa.Controls; @@ -239,27 +239,27 @@ public class RangeSlider: TemplatedControl { foreach (var tick in ticks) { - if (MathUtilities.AreClose(tick, value)) + if (MathHelpers.AreClose(tick, value)) { return value; } - if (MathUtilities.LessThan(tick, value) && MathUtilities.GreaterThan(tick, previous)) + if (MathHelpers.LessThan(tick, value) && MathHelpers.GreaterThan(tick, previous)) { previous = tick; } - else if (MathUtilities.GreaterThan(tick, value) && MathUtilities.LessThan(tick, next)) + else if (MathHelpers.GreaterThan(tick, value) && MathHelpers.LessThan(tick, next)) { next = tick; } } } - else if (MathUtilities.GreaterThan(TickFrequency, 0.0)) + else if (MathHelpers.GreaterThan(TickFrequency, 0.0)) { previous = Minimum + Math.Round((value - Minimum) / TickFrequency) * TickFrequency; next = Math.Min(Maximum, previous + TickFrequency); } - value = MathUtilities.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous; + value = MathHelpers.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous; } return value; diff --git a/src/Ursa/Controls/TagInput/TagInputPanel.cs b/src/Ursa/Controls/TagInput/TagInputPanel.cs index 38117e4..660edd0 100644 --- a/src/Ursa/Controls/TagInput/TagInputPanel.cs +++ b/src/Ursa/Controls/TagInput/TagInputPanel.cs @@ -1,6 +1,6 @@ using Avalonia; using Avalonia.Controls; -using Avalonia.Utilities; +using Irihi.Avalonia.Shared.Helpers; namespace Ursa.Controls; @@ -23,7 +23,7 @@ public class TagInputPanel: Panel child.Measure(availableSize); double deltaX = availableSize.Width - currentLineX; // Width is enough to place next child - if (MathUtilities.GreaterThan(deltaX, child.DesiredSize.Width)) + if (MathHelpers.GreaterThan(deltaX, child.DesiredSize.Width)) { currentLineX+=child.DesiredSize.Width; currentLineHeight = Math.Max(currentLineHeight, child.DesiredSize.Height); @@ -69,7 +69,7 @@ public class TagInputPanel: Panel var child = children[i]; double deltaX = finalSize.Width - currentLineX; // Width is enough to place next child - if (MathUtilities.GreaterThan(deltaX, child.DesiredSize.Width)) + if (MathHelpers.GreaterThan(deltaX, child.DesiredSize.Width)) { child.Arrange(new Rect(currentLineX, totalHeight, child.DesiredSize.Width, Math.Max(child.DesiredSize.Height, currentLineHeight))); currentLineX += child.DesiredSize.Width; diff --git a/src/Ursa/Ursa.csproj b/src/Ursa/Ursa.csproj index 8a8748d..612b3bc 100644 --- a/src/Ursa/Ursa.csproj +++ b/src/Ursa/Ursa.csproj @@ -17,7 +17,7 @@ - +