GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix various margins and spacings between UI elements in Editor to be consistent

Browse Source
This commit is contained in:
Wojtek Figat
2025-05-30 15:28:56 +02:00
parent 08ed5ae483
commit 14fcc593c7
29 changed files with 143 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Engine/UI/GUI/Panels/DropPanel.cs
View File

@@ -51,6 +51,11 @@ namespace FlaxEngine.GUI
/// </summary>
protected float _cachedHeight = 16.0f;
/// <summary>
/// The items spacing.
/// </summary>
protected float _itemsSpacing = 2.0f;
/// <summary>
/// The items margin.
/// </summary>
@@ -168,9 +173,9 @@ namespace FlaxEngine.GUI
}
/// <summary>
/// Gets or sets the item slots margin (the space between items).
/// Gets or sets the item slots margin (the space around items).
/// </summary>
[EditorOrder(10), Tooltip("The item slots margin (the space between items).")]
[EditorOrder(10)]
public Margin ItemsMargin
{
get => _itemsMargin;
@@ -184,6 +189,23 @@ namespace FlaxEngine.GUI
}
}
/// <summary>
/// Gets or sets the item slots spacing (the margin between items).
/// </summary>
[EditorOrder(11)]
public float ItemsSpacing
{
get => _itemsSpacing;
set
{
if (!Mathf.NearEqual(_itemsSpacing, value))
{
_itemsSpacing = value;
PerformLayout();
}
}
}
/// <summary>
/// Gets or sets the panel close/open animation duration (in seconds).
/// </summary>
@@ -563,25 +585,27 @@ namespace FlaxEngine.GUI
var slotsLeft = clientArea.Left + slotsMargin.Left;
var slotsWidth = clientArea.Width - slotsMargin.Width;
float minHeight = HeaderHeight;
float y = clientArea.Top;
float height = clientArea.Top + dropOffset;
float y = clientArea.Top + slotsMargin.Top;
bool anyAdded = false;
for (int i = 0; i < _children.Count; i++)
{
Control c = _children[i];
if (c.IsScrollable && c.Visible)
{
var h = c.Height;
y += slotsMargin.Top;
c.Bounds = new Rectangle(slotsLeft, y, slotsWidth, h);
h += slotsMargin.Bottom;
h += _itemsSpacing;
y += h;
height += h + slotsMargin.Top;
anyAdded = true;
}
}
// Update panel height
if (anyAdded)
y -= _itemsSpacing;
if (anyAdded)
y += slotsMargin.Bottom;
float height = dropOffset + y;
_cachedHeight = height;
if (_animationProgress >= 1.0f && _isClosed)
y = minHeight;