github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 05:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gadfly
2026-02-24 10:35:28 +08:00
committed by GitHub
parent 2a26295e90
commit 2179a25ab8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Views/CommitRefsPresenter.cs
View File

@@ -258,7 +258,7 @@ namespace SourceGit.Views
}
var requiredWidth = allowWrap && requiredHeight > 16.0
? availableSize.Width
? (double.IsInfinity(availableSize.Width) ? x + 2 : availableSize.Width)
: x + 2;
InvalidateVisual();
return new Size(requiredWidth, requiredHeight);

8
src/Views/ImageContainer.cs
View File

@@ -90,7 +90,7 @@ namespace SourceGit.Views
return new Size(scale * imageSize.Width, scale * imageSize.Height);
}
return availableSize;
return new Size(0, 0);
}
}
@@ -206,7 +206,7 @@ namespace SourceGit.Views
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);
@@ -324,7 +324,7 @@ namespace SourceGit.Views
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);
@@ -439,7 +439,7 @@ namespace SourceGit.Views
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);

3
src/Views/StashSubjectPresenter.cs
View File

@@ -120,7 +120,8 @@ namespace SourceGit.Views
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]+)\: ")]