Skip to content

fix: settings window crash after changing tile dimensions #2796

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

Open
Arufonsu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: settings window crash after changing tile dimensions #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion Intersect.Client.Framework/Gwen/Control/LabeledSlider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,25 @@ protected override void OnChildSizeChanged(Base child, Point oldChildSize, Point
SizeToChildren(resizeX: AutoSizeToContentWidthOnChildResize, resizeY: AutoSizeToContentHeightOnChildResize);
}

public void SetRange(double min, double max) => (Minimum, Maximum) = (min, max);
public void SetRange(double min, double max)
{
if (min > Maximum)
{
Maximum = max;
Minimum = min;
}
else if (max < Minimum)
{
Minimum = min;
Maximum = max;
}
else
{
// Safe to set in either order
Minimum = min;
Maximum = max;
}
}

public bool AutoSizeToContents
{
Expand Down
18 changes: 16 additions & 2 deletions Intersect.Client.Framework/Gwen/Control/Slider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,22 @@ protected virtual void SetValueInternal(double newInternalValue, bool forceUpdat
/// <param name="max">Maximum value.</param>
public void SetRange(double min, double max)
{
_minimumValue = min;
_maximumValue = max;
if (min > Maximum)
{
_maximumValue = max;
_minimumValue = min;
}
else if (max < Minimum)
{
_minimumValue = min;
_maximumValue = max;
}
else
{
// Safe to set in either order
_minimumValue = min;
_maximumValue = max;
}
}

/// <summary>
Expand Down
Loading