Skip to content
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.

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

fix(a32nx/pfd): Fix baro radio text rendering overlapped #9647

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
1. [A380X/SD] Add brake temperature color change to amber when brakes are hot - @heclak (Heclak)
1. [A380X/FCU] Fix display of values on FCU during light test - @heclak (Heclak)
1. [A380X/FMS] Fix VLS computation error for CONF 1, might have lead to FMS crashes during climb out - @flogross89 (floridude)
1. [A32NX/PFD] Fix Radio DH not displaying correctly when Baro DA is already entered - @MrJigs7 (MrJigs)

## 0.12.0

Expand Down
16 changes: 11 additions & 5 deletions fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,10 @@ class D3Cell extends DisplayComponent<{ bus: ArincEventBus }> {
this.dh,
this.mda,
);
private readonly DhModexPos = MappedSubject.create(
([noDhSelected]) => (noDhSelected ? 118.38384 : 103.47),
this.noDhSelected,
);

onAfterRender(node: VNode): void {
super.onAfterRender(node);
Expand All @@ -1754,17 +1758,19 @@ class D3Cell extends DisplayComponent<{ bus: ArincEventBus }> {
ref={this.textRef}
class={{
FontSmallest: this.noDhSelected.map(SubscribableMapFunctions.not()),
StartAlign: this.noDhSelected.map(SubscribableMapFunctions.not()),
FontMedium: this.noDhSelected,
MiddleAlign: true,
MiddleAlign: this.noDhSelected,
White: true,
}}
x="118.38384"
y="21.104172"
x={this.DhModexPos}
y="20.75"
>
<tspan>{this.mdaDhMode}</tspan>
<tspan
class={{ Cyan: true, HiddenElement: this.mdaDhValueText.map((v) => v.length <= 0) }}
style="white-space: pre"
class={{ EndAlign: true, Cyan: true, HiddenElement: this.mdaDhValueText.map((v) => v.length <= 0) }}
x="133.425"
y="20.75"
>
{this.mdaDhValueText}
</tspan>
Expand Down
Loading