Skip to content

Commit

Permalink
fix(a380x/fms): Fix FMS/PERF/TO layouting issue (#9302)
Browse files Browse the repository at this point in the history
* Fix FMS/PERF/TO layouting issue

* changelog

---------

Co-authored-by: Benjamin Dupont <4503241+Benjozork@users.noreply.github.com>
(cherry picked from commit afa6259)
  • Loading branch information
flogross89 authored and Benjozork committed Nov 2, 2024
1 parent 0218b0a commit b6f47db
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
1. [A32NX/FCU] Fixed auto-initialisation of baro unit - @tracernz (Mike)
1. [A380X/FCU] Fix baro-preselect not recognising baro unit changes - @tracernz (Mike)
1. [A380X/EFB] Fixed doors automatically opening in flight - @saschl (saschl#9432)
1. [A380X/FMS] Fixed layouting issue on FMS/ACTIVE/PERF/T.O page for some users - @flogross89 (floridude)

## 0.12.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,25 @@
display: grid;
grid-template-columns: auto auto auto auto auto;
grid-auto-rows: 50px;
margin: 20px 20px 20px 0px;
height: 150px;
margin: 10px 20px 10px 0px;
}

.mfd-fms-perf-to-thrred-noise-grid-cell {
display: flex;
justify-content: flex-end;
align-items: center;
}
.mfd-fms-perf-to-thrred-noise-grid-cell-start {
display: flex;
justify-content: flex-start;
align-items: center;
}

.mfd-fms-perf-to-thrred-noise-grid-cell-centered {
display: flex;
justify-content: center;
align-items: center;
}

.mfd-fms-perf-to-bottom {
margin: 10px 2px 3px 2px;
Expand Down
33 changes: 12 additions & 21 deletions fbw-a380x/src/systems/instruments/src/MFD/pages/FMS/MfdFmsPerf.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1315,10 +1315,10 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
</div>
</div>
<div class="mfd-fms-perf-to-thrred-noise-grid">
<div class="mfd-fms-perf-to-thrred-noise-grid-cell" style="margin-bottom: 15px; width: 125px;">
<div class="mfd-fms-perf-to-thrred-noise-grid-cell" style="margin-right: 15px; width: 125px;">
<span class="mfd-label">THR RED</span>
</div>
<div style="margin-bottom: 15px;">
<div class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<InputField<number>
dataEntryFormat={new AltitudeOrFlightLevelFormat(this.transAlt)}
dataHandlerDuringValidation={async (v) => {
Expand All @@ -1339,7 +1339,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
<div
class="mfd-fms-perf-to-thrred-noise-grid-cell"
ref={this.toNoiseFieldsRefs[0]}
style="margin-bottom: 15px; margin-right: 15px;"
style="margin-right: 15px;"
>
<svg fill="#ffffff" height="35px" width="35px" viewBox="0 0 60 60">
<polygon points="0,28 50,28 50,20 60,30 50,40 50,32 0,32" />
Expand All @@ -1350,7 +1350,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
</div>
</div>
<div>
<div ref={this.toNoiseFieldsRefs[1]} style="margin-bottom: 15px;">
<div ref={this.toNoiseFieldsRefs[1]} class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<InputField<number>
dataEntryFormat={new PercentageFormat(Subject.create(40), Subject.create(110))}
mandatory={Subject.create(false)}
Expand All @@ -1365,10 +1365,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
</div>
</div>
<div style="grid-row-start: span 2;">
<div
ref={this.toNoiseFieldsRefs[2]}
style="display: flex; justify-content: center; align-items: center;"
>
<div ref={this.toNoiseFieldsRefs[2]} class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<ConditionalComponent
width={112}
height={62}
Expand All @@ -1386,13 +1383,10 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
/>
</div>
</div>
<div
class="mfd-fms-perf-to-thrred-noise-grid-cell"
style="margin-right: 15px; margin-bottom: 15px; width: 125px;"
>
<div class="mfd-fms-perf-to-thrred-noise-grid-cell" style="margin-right: 15px; width: 125px;">
<span class="mfd-label">ACCEL</span>
</div>
<div style="margin-bottom: 15px;">
<div class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<InputField<number>
dataEntryFormat={new AltitudeOrFlightLevelFormat(this.transAlt)}
dataHandlerDuringValidation={async (v) => {
Expand All @@ -1413,7 +1407,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
<div
ref={this.toNoiseFieldsRefs[3]}
class="mfd-fms-perf-to-thrred-noise-grid-cell"
style="margin-right: 15px; margin-bottom: 15px;"
style="margin-right: 15px;"
>
<svg fill="#ffffff" height="35px" width="35px" viewBox="0 0 60 60">
<polygon points="0,28 50,28 50,20 60,30 50,40 50,32 0,32" />
Expand All @@ -1424,7 +1418,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
</div>
</div>
<div>
<div ref={this.toNoiseFieldsRefs[4]} style="margin-bottom: 15px;">
<div ref={this.toNoiseFieldsRefs[4]} class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<InputField<number>
dataEntryFormat={new SpeedKnotsFormat(Subject.create(90), Subject.create(Vmo))}
mandatory={Subject.create(false)}
Expand All @@ -1438,16 +1432,13 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
/>
</div>
</div>
<div
class="mfd-fms-perf-to-thrred-noise-grid-cell"
style="margin-right: 15px; margin-bottom: 15px; width: 125px;"
>
<div class="mfd-fms-perf-to-thrred-noise-grid-cell" style="margin-right: 15px; width: 125px;">
<span ref={this.toNoiseEndLabelRef} class="mfd-label">
NOISE END
</span>
</div>
<div>
<div ref={this.toNoiseButtonRef} style="display: flex;">
<div ref={this.toNoiseButtonRef} class="mfd-fms-perf-to-thrred-noise-grid-cell-start">
<ConditionalComponent
width={98}
height={40}
Expand All @@ -1465,7 +1456,7 @@ export class MfdFmsPerf extends FmsPage<MfdFmsPerfProps> {
componentIfTrue={<></>}
/>
</div>
<div ref={this.toNoiseEndInputRef}>
<div ref={this.toNoiseEndInputRef} class="mfd-fms-perf-to-thrred-noise-grid-cell-centered">
<InputField<number>
dataEntryFormat={new AltitudeOrFlightLevelFormat(this.transAlt)}
dataHandlerDuringValidation={async (v) =>
Expand Down

0 comments on commit b6f47db

Please sign in to comment.