xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore new_editor inspector layout fixes

Browse Source
This commit is contained in:
ssdfasd
2026-04-21 18:00:15 +08:00
parent 1e16995757
commit 233cf25965
26 changed files with 117 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
new_editor/src/Widgets/UIEditorFieldRowLayout.cpp
View File

@@ -74,26 +74,36 @@ UIEditorFieldRowLayout BuildUIEditorFieldRowLayout(
const float rowHeight = bounds.height > 0.0f ? bounds.height : metrics.rowHeight;
const ::XCEngine::UI::UIRect rowBounds(bounds.x, bounds.y, bounds.width, rowHeight);
const float resolvedMinimumControlWidth =
ClampNonNegative((std::min)(minimumControlWidth, rowBounds.width));
const float preferredControlX = rowBounds.x + metrics.controlColumnStart;
const float maximumControlX =
rowBounds.x + rowBounds.width - metrics.controlTrailingInset - resolvedMinimumControlWidth;
const float horizontalPadding = ClampNonNegative(metrics.horizontalPadding);
const float trailingInset = ClampNonNegative(metrics.controlTrailingInset);
const float defaultGap = ClampNonNegative(metrics.labelControlGap);
const float contentLeft = rowBounds.x + horizontalPadding;
const float contentRight =
rowBounds.x + ClampNonNegative(rowBounds.width) - trailingInset;
const float contentWidth = ClampNonNegative(contentRight - contentLeft);
const float requestedReservedControlWidth = ClampNonNegative(
metrics.sharedControlColumnMinWidth > 0.0f
? metrics.sharedControlColumnMinWidth
: minimumControlWidth);
const float reservedControlWidth =
ClampNonNegative((std::min)(requestedReservedControlWidth, contentWidth));
const float effectiveGap =
(std::min)(defaultGap, ClampNonNegative(contentWidth - reservedControlWidth));
const float preferredControlX =
(std::clamp)(rowBounds.x + metrics.controlColumnStart, contentLeft, contentRight);
const float maximumControlX = contentRight - reservedControlWidth;
const float controlX =
(std::clamp)(
(std::min)(preferredControlX, maximumControlX),
rowBounds.x,
rowBounds.x + rowBounds.width - metrics.controlTrailingInset);
(std::clamp)((std::min)(preferredControlX, maximumControlX), contentLeft, contentRight);
const float controlInsetY = (std::min)(metrics.controlInsetY, rowBounds.height * 0.25f);
const float controlWidth =
ClampNonNegative(rowBounds.x + rowBounds.width - metrics.controlTrailingInset - controlX);
ClampNonNegative(contentRight - controlX);
UIEditorFieldRowLayout layout = {};
layout.bounds = rowBounds;
layout.labelRect = ::XCEngine::UI::UIRect(
rowBounds.x + metrics.horizontalPadding,
contentLeft,
rowBounds.y,
ClampNonNegative(controlX - metrics.labelControlGap - rowBounds.x - metrics.horizontalPadding),
ClampNonNegative(controlX - effectiveGap - contentLeft),
rowBounds.height);
layout.controlRect = ::XCEngine::UI::UIRect(
controlX,