Skip to content

Fix various UI bugs in the RealFuelsWindow #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siimav merged 7 commits into from
Jul 27, 2026
+92 −37
Merged

Fix various UI bugs in the RealFuelsWindow #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87a06fa
lock fixes
periodically-makes-puns Jul 21, 2026
2cd0191
symmetry fixes
periodically-makes-puns Jul 23, 2026
1155872
volume authoritative
periodically-makes-puns Jul 23, 2026
4cd5c61
fixes, revert passive sync change, F2 not F1
periodically-makes-puns Jul 26, 2026
de079cc
i may be stupid
periodically-makes-puns Jul 26, 2026
24c7ddf
moar fixes
periodically-makes-puns Jul 27, 2026
e969d4e
cleanup
siimav Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Source/Tanks/ModuleFuelTanks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,9 @@ private void OnPartActionGuiDismiss(Part p)
if (p == part)
{
showUI = false;
foreach (var sym in p.symmetryCounterparts)
foreach (var mft in sym.FindModulesImplementing<ModuleFuelTanks>())
mft.showUI = false;
if (tankDefinitionSelectionGUI != null)
Destroy(tankDefinitionSelectionGUI);
}
Expand All @@ -365,7 +368,11 @@ public void Update()

// Only show the fuel tank window in the Parts tab, not in Action Groups.
if (showUI && EditorLogic.fetch?.editorScreen == EditorScreen.Parts)
RealFuelsWindow.ShowGUI(this);
{
// intentionally no-op if the PAW is not open. covers the symmetry case where a tank in symmetry can have showUI = true bc a symmetry counterpart had Show GUI clicked
if (part.PartActionWindow != null)
Comment thread
siimav marked this conversation as resolved.
RealFuelsWindow.ShowGUI(this);
}
else
RealFuelsWindow.HideGUIForModule(this);
}
Expand Down
120 changes: 84 additions & 36 deletions Source/Tanks/RealFuelsWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public QuickFillPreset(FuelInfo fi)
// Combined label embeds each propellant's volume percentage inline.
CombinedLabel = string.Join(" / ", props.Select(kv =>
kv.Key.displayName + " (" +
(kv.Key.ratio * kv.Value / fi.efficiency * 100d).ToString("F1") + "%)"));
(kv.Key.ratio * kv.Value / fi.efficiency * 100d).ToString("F2") + "%)"));
}
}

Expand All @@ -72,6 +72,12 @@ public class RealFuelsWindow : MonoBehaviour
public static void ShowGUI(ModuleFuelTanks module)
{
if (_instance == null) return;
// prevent thrashing if we attempt to swap between symmetry counterparts
// null-conditional is forbidden so you get this stack!
if (_instance._module != null &&
_instance._module.part != null &&
_instance._module.part.symmetryCounterparts.Contains(module.part))
return;

// Switching to a different module: discard stale edit buffers and cancel
// any deferred notification that belongs to the old module. Firing
Expand Down Expand Up @@ -468,17 +474,23 @@ private void Update()
private void ReassertLocks()
{
double capacity = _module.volume;
bool anyReasserted = false;

// ── Collect all valid locked entries ─────────────────────────────
var entries = new List<(FuelTank tank, string key, double lockedAmt)>();
bool anyChanged = false;
double scaledLockedVolume = 0;
foreach (var kv in _lockedAmounts)
{
FuelTank t;
if (_module.tanksDict.TryGetValue(kv.Key, out t))
if (_module.tanksDict.TryGetValue(kv.Key, out t)) // only consider if the value is actually different
{
entries.Add((t, kv.Key, kv.Value));
scaledLockedVolume += t.Volume;
if (Math.Abs(t.maxAmount - kv.Value) > 0.0001d)
anyChanged = true;
}
}
if (entries.Count == 0) return;
if (!anyChanged) return;

// ── Total locked physical volume ──────────────────────────────────
// If the tank shrank so much that even the locked resources alone
Expand All @@ -492,6 +504,9 @@ private void ReassertLocks()
? capacity / totalLockedLitres
: 1d;

// Re-scale unlocked resources so total volume remains unchanged
double unlockedScale = Math.Max(0, (capacity - totalLockedLitres) / (capacity - scaledLockedVolume));

// ── Re-assert each locked resource ────────────────────────────────
foreach (var (tank, key, lockedAmt) in entries)
{
Expand All @@ -512,7 +527,6 @@ private void ReassertLocks()
{
tank.maxAmount = targetAmt;
tank.amount = tank.fillable ? tank.maxAmount : 0d;
anyReasserted = true;
}

// Always keep edit and pct buffers current for locked resources.
Expand All @@ -523,8 +537,27 @@ private void ReassertLocks()
_pctBuf[key] = pct.ToString("F2");
}

if (anyReasserted)
_pendingNotify = true; // tell the editor the part changed
if (scaledLockedVolume != capacity)
{
foreach (var kv in _module.tanksDict)
{
if (!_lockedAmounts.ContainsKey(kv.Key) && kv.Value.maxAmount != 0)
{
var tank = kv.Value;
tank.maxAmount *= unlockedScale;
tank.amount = tank.fillable ? tank.maxAmount : 0d;
if (unlockedScale == 0)
RemoveTank(tank);
else
{
_editBuf[kv.Key] = tank.maxAmount.ToString("F4");
double pct = capacity > 0d ? (tank.maxAmount / capacity) * 100d : 0d;
_pctBuf[kv.Key] = pct.ToString("F2");
}
}
}
}
_pendingNotify = true; // The part always changes if we reach this part.
}

// ── Main OnGUI ───────────────────────────────────────────────────────
Expand Down Expand Up @@ -1333,7 +1366,7 @@ private void DrawAvailRow(FuelTank tank)
double initPct;
double.TryParse(_availFillPctBuf[tank.name], out initPct);
_availAmountBuf[tank.name] =
(maxRfUnits * Math.Max(0d, Math.Min(100d, initPct)) / 100d).ToString("F1");
(maxRfUnits * Math.Max(0d, Math.Min(100d, initPct)) / 100d).ToString("F2");
}

string oldPctText = _availFillPctBuf[tank.name];
Expand Down Expand Up @@ -1374,41 +1407,42 @@ private void DrawAvailRow(FuelTank tank)
double amt;
if (double.TryParse(newAmt, out amt) && maxRfUnits > 0.001d)
_availFillPctBuf[tank.name] =
Math.Min(100d, amt / maxRfUnits * 100d).ToString("F1");
Math.Min(100d, amt / maxRfUnits * 100d).ToString("F2");
}
// Percentage field changed — recompute amount
else if (newPct != oldPctText)
{
_availFillPctBuf[tank.name] = newPct;
double pct;
double.TryParse(newPct, out pct);
double.TryParse(newPct, out double fillPct);
_availAmountBuf[tank.name] =
(maxRfUnits * Math.Max(0d, Math.Min(100d, pct)) / 100d).ToString("F1");
(maxRfUnits * Math.Max(0d, Math.Min(100d, fillPct)) / 100d).ToString("F2");
}
// Neither changed — passive sync so amount reflects current physAvail
// (e.g. after another resource is added). Skip if amount field is focused
// so we don't clobber text the player is actively editing.
else if (GUI.GetNameOfFocusedControl() != "availAmt_" + tank.name)
// Neither changed. If percentage is still default, sync amount to match. Otherwise, respect the user-entered value
double.TryParse(_availFillPctBuf[tank.name], out double pct);
double.TryParse(_availAmountBuf[tank.name], out double fillAmt);
if (pct >= 100d)
{
double pct;
double.TryParse(_availFillPctBuf[tank.name], out pct);
_availAmountBuf[tank.name] =
(maxRfUnits * Math.Max(0d, Math.Min(100d, pct)) / 100d).ToString("F1");
fillAmt = maxRfUnits;
if (GUI.GetNameOfFocusedControl() != "availAmt_" + tank.name)
_availAmountBuf[tank.name] =
(maxRfUnits * Math.Max(0d, Math.Min(100d, pct)) / 100d).ToString("F2");
}
else if (GUI.GetNameOfFocusedControl() != "availPct_" + tank.name && maxRfUnits >= 0.0001)
{
_availFillPctBuf[tank.name] =
Math.Min(100d, fillAmt / maxRfUnits * 100d).ToString("F2");
}

// fillFrac is always derived from the pct buffer (source of truth)
double fillPct;
double.TryParse(_availFillPctBuf[tank.name], out fillPct);
double fillFrac = Math.Max(0d, Math.Min(100d, fillPct)) / 100d;
// fillFrac is always derived from the (updated) volume buffer (source of truth)

// ── +ADD / FULL ───────────────────────────────────────────────────
if (canAdd && GUI.Button(new Rect(rx, aby, btnW, abh), "+ADD", _sBtnAdd))
AddTank(tank, fillFrac);
AddTank(tank, fillAmt);
else if (!canAdd)
GUI.Label(new Rect(rx, aby, btnW, abh), "FULL", _sAvailFull);
if (canAdd)
SetTooltip(new Rect(rx, aby, btnW, abh),
"Add this resource at the specified % of total tank capacity.\nCapped at currently available space.");
"Add the specified amount of this resource.\nCapped at currently available space.");
}

// ── Quick Fill ratio status ──────────────────────────────────────────
Expand Down Expand Up @@ -1474,7 +1508,7 @@ private RatioResult GetRatioStatus(QuickFillPreset p)
double actual = (loaded[i].Volume / mixTotal) * 100d;
double target = p.PropTargets[i].targetPct;
maxDev = Math.Max(maxDev, Math.Abs(actual - target));
parts.Add(actual.ToString("F1") + "%");
parts.Add(actual.ToString("F2") + "%");
}

string label = string.Join(" / ", parts);
Expand Down Expand Up @@ -1573,7 +1607,7 @@ private void DrawQuickFillRow(Rect r, QuickFillPreset p, double remaining)
double.TryParse(_qfFillPctBuf[p.Key], out fillPct);
double fillLitres = remaining * Math.Max(0d, Math.Min(100d, fillPct)) / 100d;
GUI.Label(new Rect(rx, r.y, litW, topH),
fillLitres.ToString("F1") + " L", _sQfRatio);
fillLitres.ToString("F2") + " L", _sQfRatio);

// ── Status line (bottom) ────────────────────────────────────────
var rs = GetRatioStatus(p);
Expand Down Expand Up @@ -1929,7 +1963,10 @@ private void SetVolumeAndScaleOthers(FuelTank tank, double newLitres)
{
double scale = Math.Max(0d, remaining) / totalOther;
foreach (var o in others)
{
o.maxAmount = o.Volume * scale * o.utilization;
SyncLockedTank(o);
}
}
}
else if (unlockedSum > 0d)
Expand All @@ -1945,6 +1982,7 @@ private void SetVolumeAndScaleOthers(FuelTank tank, double newLitres)
// Write the target tank last (RF setter may trigger events).
tank.maxAmount = newLitres * tank.utilization;
tank.amount = tank.fillable ? tank.maxAmount : 0d;
SyncLockedTank(tank);

SyncEditBuffers();
_module.MarkWindowDirty();
Expand All @@ -1963,25 +2001,35 @@ private void RemoveTank(FuelTank tank)
}

/// <summary>
/// Activate a previously-empty tank, filling <paramref name="fillFrac"/> of the
/// remaining available volume (1.0 = 100%). Defaults to full fill.
/// Activate a previously-empty tank, filling <paramref name="amount"/> L
/// </summary>
private void AddTank(FuelTank tank, double fillFrac = 1.0)
private void AddTank(FuelTank tank, double amount)
{
double avail = Math.Max(0d, _module.AvailableVolume - _reserveVolume);
if (avail < 0.001d) return;
// fillFrac is relative to total tank capacity (same basis as the pct field in
// DrawAvailRow), so two resources set to 5% each always contribute 5% of the
// total regardless of add order. Cap at physAvail to prevent overfill.
double fill = Math.Min(_module.volume * Math.Max(0d, Math.Min(1d, fillFrac)), avail);
tank.maxAmount = fill * tank.utilization;
if (avail * tank.utilization < amount) amount = avail * tank.utilization;
tank.maxAmount = amount;
tank.amount = tank.fillable ? tank.maxAmount : 0d;
// Store RF units in the edit buffer — consistent with DrawCurrentRow display.
_editBuf[tank.name] = tank.maxAmount.ToString("F4");
_module.MarkWindowDirty();
NotifyEditor();
}

/// <summary>
Comment thread
siimav marked this conversation as resolved.
/// Updates the contents of _lockedAmounts to match the current fill level of the tank, if it was locked before.
/// </summary>
/// <param name="tank"></param>
private void SyncLockedTank(FuelTank tank)
{
if (_lockedAmounts.ContainsKey(tank.name))
{
_lockedAmounts[tank.name] = tank.maxAmount;
if (tank.maxAmount == 0)
_lockedAmounts.Remove(tank.name);
}
}

/// <summary>
/// Fills the remaining tank volume with this engine's propellant ratios.
/// Activates any preset propellants not yet in the tank, then distributes
Expand Down