Skip to content

fix: prevent MeasureOverride from returning Infinity to Avalonia layout (#2136) #2137

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
gadfly3173 wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −6
Open

fix: prevent MeasureOverride from returning Infinity to Avalonia layout (#2136) #2137

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
2 changes: 1 addition & 1 deletion src/Views/CommitRefsPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ protected override Size MeasureOverride(Size availableSize)
}

var requiredWidth = allowWrap && requiredHeight > 16.0
? availableSize.Width
? (double.IsInfinity(availableSize.Width) ? x + 2 : availableSize.Width)
: x + 2;
InvalidateVisual();
return new Size(requiredWidth, requiredHeight);
Expand Down
8 changes: 4 additions & 4 deletions src/Views/ImageContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected override Size MeasureOverride(Size availableSize)
return new Size(scale * imageSize.Width, scale * imageSize.Height);
}

return availableSize;
return new Size(0, 0);
}
}

Expand Down Expand Up @@ -206,7 +206,7 @@ protected override Size MeasureOverride(Size availableSize)
var right = NewImage;

if (left == null)
return right == null ? availableSize : GetDesiredSize(right.Size, availableSize);
return right == null ? new Size(0, 0) : GetDesiredSize(right.Size, availableSize);

if (right == null)
return GetDesiredSize(left.Size, availableSize);
Expand Down Expand Up @@ -324,7 +324,7 @@ protected override Size MeasureOverride(Size availableSize)
var right = NewImage;

if (left == null)
return right == null ? availableSize : GetDesiredSize(right.Size, availableSize);
return right == null ? new Size(0, 0) : GetDesiredSize(right.Size, availableSize);

if (right == null)
return GetDesiredSize(left.Size, availableSize);
Expand Down Expand Up @@ -439,7 +439,7 @@ protected override Size MeasureOverride(Size availableSize)
var right = NewImage;

if (left == null)
return right == null ? availableSize : GetDesiredSize(right.Size, availableSize);
return right == null ? new Size(0, 0) : GetDesiredSize(right.Size, availableSize);

if (right == null)
return GetDesiredSize(left.Size, availableSize);
Expand Down
3 changes: 2 additions & 1 deletion src/Views/StashSubjectPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ protected override Size MeasureOverride(Size availableSize)
var typeface = new Typeface(FontFamily);
var test = new FormattedText("fgl|", CultureInfo.CurrentCulture, FlowDirection.LeftToRight, typeface, FontSize, Brushes.White);
var h = Math.Max(18, test.Height);
return new Size(availableSize.Width, h);
var w = double.IsInfinity(availableSize.Width) ? 0 : availableSize.Width;
return new Size(w, h);
}

[GeneratedRegex(@"^On ([^\s]+)\: ")]
Expand Down