erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(combat): resolve power spans after layout

Browse source 
Derive the dark middle range from live post-anchor sibling geometry instead of freezing the inherited 800-pixel prototype during controller binding. Render the user-directed bright desired-power band independently from the absolute bar-left edge to the green thumb center.

Co-Authored-By: Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-12 21:49:17 +02:00
parent 707add8539
commit f8c174d707
8 changed files with 129 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/AcDream.App/UI/Layout/CombatUiController.cs
View file

@ -93,7 +93,8 @@ public sealed class CombatUiController : IRetainedPanelController
_powerControl.SetScalarPosition(_attacks.DesiredPower);
_powerControl.ScalarChanged = _attacks.SetDesiredPower;
_powerControl.ScalarFill = () => _attacks.PowerBarLevel;
_powerControl.ScalarFill = () => null;
_powerControl.ScalarFillFollowsThumb = true;
BindAttackButton(_high, AttackHeight.High);
BindAttackButton(_medium, AttackHeight.Medium);
@ -201,12 +202,14 @@ public sealed class CombatUiController : IRetainedPanelController
// the meter between the authored text rectangles leaves the base gray
// track behind Speed/Power while the dark/live red textures occupy the
// semantic power range between them.
float left = speedLabel.Left + speedLabel.Width - _powerControl.Left;
float right = powerLabel.Left - _powerControl.Left;
_powerControl.ScalarRangeLeft = Math.Clamp(left, 0f, _powerControl.Width);
_powerControl.ScalarRangeWidth = Math.Max(
0f, Math.Clamp(right, 0f, _powerControl.Width)
- _powerControl.ScalarRangeLeft);
_powerControl.ScalarRangeProvider = () =>
{
float left = speedLabel.Left + speedLabel.Width - _powerControl.Left;
float right = powerLabel.Left - _powerControl.Left;
float clampedLeft = Math.Clamp(left, 0f, _powerControl.Width);
return (clampedLeft, Math.Max(
0f, Math.Clamp(right, 0f, _powerControl.Width) - clampedLeft));
};
}
private static void SetStaticText(UiText? text, string value, bool rightAligned)
@ -233,6 +236,8 @@ public sealed class CombatUiController : IRetainedPanelController
_attacks.StateChanged -= OnAttackStateChanged;
_powerControl.ScalarChanged = null;
_powerControl.ScalarFill = () => null;
_powerControl.ScalarFillFollowsThumb = false;
_powerControl.ScalarRangeProvider = null;
_high.OnPressed = null;
_high.OnReleased = null;
_medium.OnPressed = null;

38
src/AcDream.App/UI/UiScrollbar.cs
View file

@ -49,6 +49,14 @@ public sealed class UiScrollbar : UiElement
public float ScalarRangeLeft { get; set; }
public float ScalarRangeWidth { get; set; } = float.PositiveInfinity;
/// <summary>
/// Optional live range geometry. Imported sibling controls reflow immediately
/// before drawing, so combat derives its centered range from their current
/// rectangles instead of freezing pre-reflow prototype coordinates.
/// </summary>
public Func<(float Left, float Width)>? ScalarRangeProvider { get; set; }
/// <summary>Draw the scalar fill from the absolute left edge to the thumb center.</summary>
public bool ScalarFillFollowsThumb { get; set; }
/// <summary>
/// Draw the scalar meter from the power end (right) toward the speed end
/// (left). This is the authored gmCombatUI power meter direction.
/// </summary>
@ -141,14 +149,21 @@ public sealed class UiScrollbar : UiElement
if (ScalarRangeSprite != 0)
DrawTiled(ctx, resolve, ScalarRangeSprite,
rangeLeft, 0f, rangeWidth, Height);
if (ScalarFill() is float fill && ScalarFillSprite != 0)
float thumbWidth = ScalarThumbWidth(resolve);
if (ScalarFillSprite != 0 && ScalarFillFollowsThumb)
{
var (fillX, visibleWidth) = ScalarThumbFillRect(
Width, thumbWidth, ScalarPosition);
DrawTiledClipped(ctx, resolve, ScalarFillSprite,
0f, fillX, visibleWidth, Height);
}
else if (ScalarFill() is float fill && ScalarFillSprite != 0)
{
var (fillX, visibleWidth) = ScalarFillRect(
rangeLeft, rangeWidth, fill, ScalarFillFromRight);
DrawTiledClipped(ctx, resolve, ScalarFillSprite,
rangeLeft, fillX, visibleWidth, Height);
}
float thumbWidth = ScalarThumbWidth(resolve);
float travel = MathF.Max(0f, Width - thumbWidth);
float x = travel * ScalarPosition;
DrawSprite(ctx, resolve, ThumbSprite, x, 0f, thumbWidth, Height);
@ -233,14 +248,27 @@ public sealed class UiScrollbar : UiElement
private (float left, float width) ScalarRangeRect()
{
float left = Math.Clamp(ScalarRangeLeft, 0f, Width);
float requestedWidth = float.IsPositiveInfinity(ScalarRangeWidth)
(float configuredLeft, float configuredWidth) = ScalarRangeProvider?.Invoke()
?? (ScalarRangeLeft, ScalarRangeWidth);
float left = Math.Clamp(configuredLeft, 0f, Width);
float requestedWidth = float.IsPositiveInfinity(configuredWidth)
? Width - left
: MathF.Max(0f, ScalarRangeWidth);
: MathF.Max(0f, configuredWidth);
float width = Math.Clamp(requestedWidth, 0f, Width - left);
return (left, width);
}
/// <summary>Returns the absolute-left fill ending at the scalar thumb center.</summary>
public static (float x, float width) ScalarThumbFillRect(
float totalWidth, float thumbWidth, float position)
{
float safeWidth = MathF.Max(0f, totalWidth);
float safeThumb = Math.Clamp(thumbWidth, 0f, safeWidth);
float travel = safeWidth - safeThumb;
float center = travel * Math.Clamp(position, 0f, 1f) + safeThumb * 0.5f;
return (0f, center);
}
public override bool OnEvent(in UiEvent e)
{
if (Horizontal && ScalarChanged is not null)