chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: #1533

Browse Source
This commit is contained in:
NaBian committed 2024-03-05 15:08:47 +08:00
1 parent 90985dffe9
commit 6333276c1b
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
+4 -2
View File
@@ -59,7 +59,9 @@ public class Row : Panel
if (cellCount > 0 && !child.IsFixed)
{
totalCellCount += cellCount;
child.Measure(new Size(cellCount * itemWidth - gutter, constraint.Height));
var availableWidth = Math.Max(0, cellCount * itemWidth - gutter);
child.Measure(new Size(availableWidth, constraint.Height));
_maxChildDesiredHeight = Math.Max(_maxChildDesiredHeight, child.DesiredSize.Height);
if (totalCellCount > ColLayout.ColMaxCellCount)
@@ -94,7 +96,7 @@ public class Row : Panel
var cellCount = child.GetLayoutCellCount(_layoutStatus);
totalCellCount += cellCount;
var childWidth = (cellCount > 0 && !child.IsFixed) ? cellCount * itemWidth - gutter : child.DesiredSize.Width;
var childWidth = (cellCount > 0 && !child.IsFixed) ? Math.Max(0, cellCount * itemWidth - gutter) : child.DesiredSize.Width;
childBounds.Width = childWidth;
childBounds.X += child.Offset * itemWidth;