epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds TopBottomSpacing to GridLayout.

Browse Source
This commit is contained in:
deniz1a
2015-08-04 01:46:55 +03:00
parent 90897481f9
commit 347143ba87
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Widgets/GridLayout.cs
View File

@@ -24,14 +24,14 @@ namespace OpenRA.Mods.Common.Widgets
{ {
if (widget.Children.Count == 0) if (widget.Children.Count == 0)
{ {
widget.ContentHeight = widget.ItemSpacing; widget.ContentHeight = 2 * widget.TopBottomSpacing;
pos = new int2(widget.ItemSpacing, widget.ItemSpacing); pos = new int2(widget.ItemSpacing, widget.TopBottomSpacing);
} }
if (pos.X + widget.ItemSpacing + w.Bounds.Width > widget.Bounds.Width - widget.ScrollbarWidth) if (pos.X + w.Bounds.Width + widget.ItemSpacing > widget.Bounds.Width - widget.ScrollbarWidth)
{ {
/* start a new row */ /* start a new row */
pos = new int2(widget.ItemSpacing, widget.ContentHeight); pos = new int2(widget.ItemSpacing, widget.ContentHeight - widget.TopBottomSpacing + widget.ItemSpacing);
} }
w.Bounds.X += pos.X; w.Bounds.X += pos.X;
@@ -39,11 +39,9 @@ namespace OpenRA.Mods.Common.Widgets
pos = pos.WithX(pos.X + w.Bounds.Width + widget.ItemSpacing); pos = pos.WithX(pos.X + w.Bounds.Width + widget.ItemSpacing);
widget.ContentHeight = Math.Max(widget.ContentHeight, pos.Y + widget.ItemSpacing + w.Bounds.Height); widget.ContentHeight = Math.Max(widget.ContentHeight, pos.Y + w.Bounds.Height + widget.TopBottomSpacing);
} }
public void AdjustChildren() public void AdjustChildren() { }
{
}
} }
} }

3
OpenRA.Mods.Common/Widgets/ListLayout.cs
View File

@@ -38,7 +38,8 @@ namespace OpenRA.Mods.Common.Widgets
widget.ContentHeight += w.Bounds.Height + widget.ItemSpacing; widget.ContentHeight += w.Bounds.Height + widget.ItemSpacing;
} }
// The loop above appended an extra widget.ItemSpacing after the last item. Replace it with proper bottom spacing. // The loop above appended an extra widget.ItemSpacing after the last item.
// Replace it with proper bottom spacing.
widget.ContentHeight += widget.TopBottomSpacing - widget.ItemSpacing; widget.ContentHeight += widget.TopBottomSpacing - widget.ItemSpacing;
} }
} }