From 7c2c7f3ffc5c208e22587a9861a6e68258f50771 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Wed, 9 Feb 2022 22:07:41 +0000
Subject: [PATCH] Fix C3S on PERF pages; correct brackets for new font and
 improve layout of PERF TO / PERF APPR pages per references

---
 Models/Instruments/MCDU/MCDU.nas | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 8bfc05a0..646de39c 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -4036,6 +4036,7 @@ var canvas_MCDU_base = {
 				me.fontSizeLeft(normal, normal, normal, normal, 0, normal);
 				me.fontSizeRight(normal, small, 0, 0, 0, normal);
 				me.fontSizeCenter(small, small, small, 0, 0, 0);
+				me.fontSizeCenterS(small, small, small, small, small, small);
 				
 				me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht");
 				me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
@@ -4052,7 +4053,7 @@ var canvas_MCDU_base = {
 			}
 			
 			me["Simple_L4"].setText(sprintf("%3.0f", fmgc.FMGCInternal.transAlt));
-			me["Simple_L5"].setText(sprintf("%3.0f", clbReducFt.getValue()) ~ sprintf("/%3.0f", reducFt.getValue()));
+			me["Simple_L5"].setText(" " ~ sprintf("%3.0f", clbReducFt.getValue()) ~ sprintf("/%3.0f", reducFt.getValue()));
 			me["Simple_L6"].setText(" TO DATA");
 			me["Simple_L1S"].setText(" V1");
 			me["Simple_L2S"].setText(" VR");
@@ -4060,7 +4061,7 @@ var canvas_MCDU_base = {
 			me["Simple_L4S"].setText("TRANS ALT");
 			me["Simple_L5S"].setText("THR RED/ACC");
 			me["Simple_L6S"].setText(" UPLINK");
-			me["Simple_R2"].setText("[   ]  ");
+			me["Simple_R2"].setText("[M][ ]  ");
 			me["Simple_R5"].setText(sprintf("%3.0f", engOutAcc.getValue()));
 			me["Simple_R6"].setText("PHASE ");
 			me["Simple_R1S"].setText("RWY ");
@@ -4147,14 +4148,14 @@ var canvas_MCDU_base = {
 				}
 			} else {
 				me["Simple_R3"].setFontSize(small); 
-				me["Simple_R3"].setText("[  ]/[    ]");
+				me["Simple_R3"].setText("[  ]/[  ]");
 			}
 			if (flexSet.getValue() == 1) {
 				me["Simple_R4"].setFontSize(normal); 
-				me["Simple_R4"].setText(sprintf("%3.0f", flex.getValue()));
+				me["Simple_R4"].setText(sprintf("%3.0f°", flex.getValue()));
 			} else {
 				me["Simple_R4"].setFontSize(small); 
-				me["Simple_R4"].setText("[   ]");
+				me["Simple_R4"].setText("[ ]°");
 			}
 			if (engOutAccSet.getValue() == 1) {
 				me["Simple_R5"].setFontSize(normal);
@@ -4174,7 +4175,7 @@ var canvas_MCDU_base = {
 			
 			me["Simple_C1S"].setText("FLP RETR");
 			me["Simple_C2S"].setText("SLT RETR");
-			me["Simple_C3S"].setText("   CLEAN");
+			me["Simple_C3S"].setText("  CLEAN");
 
 		} else if (page == "PERFCLB") {
 			if (!pageSwitch[i].getBoolValue()) {
@@ -4631,6 +4632,7 @@ var canvas_MCDU_base = {
 				me.fontSizeLeft(small, small, small, small, small, normal);
 				me.fontSizeRight(normal, small, small, small, normal, normal);
 				me.fontSizeCenter(small, small, small, 0, small, 0);
+				me.fontSizeCenterS(small, small, small, small, small, small);
 				
 				me.colorLeft("blu", "blu", "blu", "blu", "blu", "wht");
 				me.colorLeftS("wht", "wht", "wht", "wht", "wht", "wht");
@@ -4666,7 +4668,7 @@ var canvas_MCDU_base = {
 			if (dest_temp.getValue() != -999) {
 				me["Simple_L2"].setText(sprintf("%3.0f°", dest_temp.getValue()));
 			} else {
-				me["Simple_L2"].setText("---°");
+				me["Simple_L2"].setText("[ ]°");
 			}
 			
 			me["Simple_L3S"].setText("MAG WIND");
@@ -4680,7 +4682,7 @@ var canvas_MCDU_base = {
 					var result = myDESWIND[math.abs(i-1)].returnGRND();
 					me["Simple_L3"].setText(sprintf("%03.0f°", result[0]) ~ sprintf("/%.0f", result[1]));
 				} else {
-					me["Simple_L3"].setText("---°/---");
+					me["Simple_L3"].setText("[ ]°/[  ]");
 				}
 			}
 			
@@ -4763,14 +4765,14 @@ var canvas_MCDU_base = {
 					me["Simple_L5"].setText(sprintf("%3.0f", fmgc.FMGCInternal.vapp_appr));
 					me.fontSizeLeft(0, 0, 0, 0, normal, 0);
 				} else {
-					me["Simple_L5"].setText("[   ]  ");
+					me["Simple_L5"].setText("[  ]  ");
 					me.fontSizeLeft(0, 0, 0, 0, small, 0);
 				}
 			}
 			
 			me["Simple_C1S"].setText("FLP RETR");
 			me["Simple_C2S"].setText("SLT RETR");
-			me["Simple_C3S"].setText("   CLEAN");
+			me["Simple_C3S"].setText("  CLEAN");
 			me["Simple_C5S"].setText("VLS");
 
 		} else if (page == "PERFGA") {
@@ -4847,7 +4849,7 @@ var canvas_MCDU_base = {
 			
 			me["Simple_C1S"].setText("FLP RETR");
 			me["Simple_C2S"].setText("SLT RETR");
-			me["Simple_C3S"].setText("   CLEAN");
+			me["Simple_C3S"].setText("  CLEAN");
 		} else if (page == "WINDCLB" or page == "WINDCRZ" or page == "WINDDES" or page == "WINDHIST") {
 			if (!pageSwitch[i].getBoolValue()) {
 				me.defaultHideWithCenter();