Skip to content

Disallow NaNs in Rect's Width and Height properties #18971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BioTurboNick wants to merge 5 commits into from
Closed

Disallow NaNs in Rect's Width and Height properties #18971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cb16dd
Disallow NaNs in Rect
BioTurboNick Nov 23, 2023
3aea7ea
Apply suggestions from code review
BioTurboNick Dec 2, 2023
4e17d0c
Rely on setters for checks
BioTurboNick Dec 2, 2023
9a4d2e6
Merge branch 'rect-nans' of https://github.com/BioTurboNick/maui into…
BioTurboNick Dec 2, 2023
5b84b76
Don't allocate the Rect just for an equality check, and fix properties
BioTurboNick Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Window/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void IWindow.FrameChanged(Rect frame)
var y = Y;
var width = Width;
var height = Height;
if (new Rect(x, y, width, height) == frame)
if (frame.X == x && frame.Y == y && frame.Width == width && frame.Height == height)
return;

_batchFrameUpdate++;
Expand Down
25 changes: 23 additions & 2 deletions src/Graphics/src/Graphics/Rect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,34 @@ namespace Microsoft.Maui.Graphics
[TypeConverter(typeof(Converters.RectTypeConverter))]
public partial struct Rect
{
double _height;
double _width;

public double X { get; set; }

public double Y { get; set; }

public double Width { get; set; }
public double Width
{
get => _width;
set
{
if (double.IsNaN(value))
throw new ArgumentOutOfRangeException(nameof(value), value, "Cannot be NaN");
_width = value;
}
}

public double Height { get; set; }
public double Height
{
get => _height;
set
{
if (double.IsNaN(value))
throw new ArgumentOutOfRangeException(nameof(value), value, "Cannot be NaN");
_height = value;
}
}

public static Rect Zero = new Rect();

Expand Down