Cleaning code.

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -226,7 +226,7 @@ private void ModifyWindowSize()
             if (SymbolsRowCount > 0)
             {
                 var desiredHeight = FontToBold ? Owner.TextFontDefaultBold.Height * RowsCount
-                    : Owner.TextFontDefault.Height * RowsCount + SymbolWidth;
+                    : (Owner.TextFontDefault.Height * RowsCount) + SymbolWidth;
                 var desiredWidth = (SymbolsRowCount * SymbolWidth) + (SpacerRowCount * (SymbolWidth / 2)) + (LocoRowCount * (SymbolWidth * 2));
 
                 var newHeight = (int)MathHelper.Clamp(desiredHeight, 80, WindowHeightMax);
@@ -406,8 +406,8 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                 // Updates power supply status
                 else if (isElectricDieselLocomotive &&
                      (PowerSupplyStatus != null && PowerSupplyStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus()
-                      || BatteryStatus != null && BatteryStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus()
-                      || CircuitBreakerState != null && CircuitBreakerState != (trainCar as MSTSElectricLocomotive).ElectricPowerSupply.CircuitBreaker.State.ToString()))
+                      || (BatteryStatus != null && BatteryStatus != Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus())
+                      || (CircuitBreakerState != null && CircuitBreakerState != (trainCar as MSTSElectricLocomotive).ElectricPowerSupply.CircuitBreaker.State.ToString())))
                 {
                     Layout();
                     UpdateWindowSize();
@@ -549,8 +549,6 @@ void buttonHandBrake_Click(Control arg1, Point arg2)
                         if ((Viewer.PlayerTrain.Cars[CarPosition] as MSTSWagon).GetTrainHandbrakeStatus())
                         {
                             Viewer.Simulator.Confirmer.Information(Viewer.Catalog.GetString("Handbrake set"));
-
-
                             Texture = HandBrakeSet;
                         }
                         else
@@ -849,7 +847,7 @@ public buttonToggleMU(int x, int y, int size, Viewer viewer, int carPosition)
                 var multipleUnitsConfiguration = Viewer.PlayerLocomotive.GetMultipleUnitsConfiguration();
                 if (Viewer.PlayerTrain.Cars[CarPosition] is MSTSDieselLocomotive && multipleUnitsConfiguration != null)
                 {
-                    Texture = Viewer.TrainCarOperationsWindow.ModifiedSetting || (Viewer.PlayerTrain.Cars[CarPosition] as MSTSLocomotive).RemoteControlGroup == 0 && multipleUnitsConfiguration != "1" ? MUconnected : MUdisconnected;
+                    Texture = Viewer.TrainCarOperationsWindow.ModifiedSetting || ((Viewer.PlayerTrain.Cars[CarPosition] as MSTSLocomotive).RemoteControlGroup == 0 && multipleUnitsConfiguration != "1")? MUconnected : MUdisconnected;
                 }
                 else
                 {

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -70,7 +70,6 @@ public class TrainCarOperationsWindow : Window
         internal static Texture2D RearAngleCockClosed;
         internal static Texture2D RearAngleCockOpened;
 
-
         public int DisplaySizeY;
         public bool LayoutUpdated = false;
         public bool AllSymbolsMode = true;
@@ -266,7 +265,7 @@ private void ModifyWindowSize()
 
                 DesiredHeight = FontToBold ? (Owner.TextFontDefaultBold.Height * (RowsCount + 1)) + (separatorSize * (SeparatorCount + 3))
                     : (Owner.TextFontDefault.Height * (RowsCount + 1)) + (separatorSize * (SeparatorCount + 3));
-                var desiredWidth = (SymbolsRowCount * SymbolSize) + (SpacerRowCount * (textWidth / 2)) + CarUIDLenght + textWidth * 2;
+                var desiredWidth = (SymbolsRowCount * SymbolSize) + (SpacerRowCount * (textWidth / 2)) + CarUIDLenght + (textWidth * 2);
 
                 // Takes the height of the TrainOperationsViewer as the margin area.
                 RowHeight = textWidth + separatorSize;
@@ -277,7 +276,7 @@ private void ModifyWindowSize()
                     : marginTraincarViewer;
                 WindowHeightMax = DisplaySizeY - marginTraincarViewer;
 
-                var newHeight = MathHelper.Clamp(DesiredHeight, (textWidth + separatorSize) * 3 + separatorSize, WindowHeightMax);
+                var newHeight = MathHelper.Clamp(DesiredHeight, ((textWidth + separatorSize) * 3) + separatorSize, WindowHeightMax);
                 var newWidth = MathHelper.Clamp(desiredWidth, 100, WindowWidthMax);
 
                 // Move the dialog up if we're expanding it, or down if not; this keeps the center in the same place.
@@ -936,7 +935,6 @@ public Texture2D LocomotiveStatus(int CarPosition)
                 string valuePart = parts?[1];
                 if (keyPart.Contains(Viewer.Catalog.GetString("Engine")))
                 {
-
                     TrainCarOperations.PowerSupplyStatus = locomotiveStatus;
 
                     Texture = valuePart.Contains(Viewer.Catalog.GetString("Running")) ? PowerOn