Merge pull request #622 from mbm-OR/bugfix/Fix-TDI-brakes-token-alignment

Bug fix for https://bugs.launchpad.net/or/+bug/1965311. TDI: The vacuum brake value is misaligned.

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs

@@ -46,6 +46,13 @@ public struct ListLabel
         }
         public List<ListLabel> labels = new List<ListLabel>();
 
+        List<string> tokens = new List<string>()
+        {
+            Viewer.Catalog.GetString("BP"),
+            Viewer.Catalog.GetString("EQ"),
+            Viewer.Catalog.GetString("V")
+        };
+
         /// <summary>
         /// Table of Colors to client-side color codes.
         /// </summary>
@@ -266,7 +273,7 @@ protected internal override void Initialize()
         {
             base.Initialize();
             // Reset window size
-            UpdateWindowSize();
+            if (Visible) UpdateWindowSize();
         }
 
         protected override ControlLayout Layout(ControlLayout layout)
@@ -276,6 +283,16 @@ protected override ControlLayout Layout(ControlLayout layout)
             {
                 var colWidth = labels.Max(x => x.FirstColWidth) + (normalTextMode? 15: 20);
                 var TimeHboxPositionY = 0;
+
+                // search wider
+                var tokenOffset = 0;
+                var tokenWidth = 0;
+                foreach (var data in tokens.Where((string d) => !string.IsNullOrWhiteSpace(d)))
+                {
+                    tokenWidth = Owner.TextFontDefault.MeasureString(data);
+                    tokenOffset = tokenWidth > tokenOffset ? tokenWidth : tokenOffset;
+                }
+
                 foreach (var data in labels.ToList())
                 {
                     if (data.FirstCol.Contains("NwLn"))
@@ -368,7 +385,16 @@ protected override ControlLayout Layout(ControlLayout layout)
                             }
                             else
                             {
-                                hbox.Add(indicator = new Label(colWidth, hbox.RemainingHeight, LastCol));
+                                var iniLastCol = Viewer.Catalog.GetString(LastCol).IndexOf(" ");
+                                if (tokens.Any(LastCol.Contains) && iniLastCol >= 0)
+                                {
+                                    hbox.Add(indicator = new Label(tokenOffset + (normalTextMode ? 5 : 3), hbox.RemainingHeight, LastCol.Substring(0, iniLastCol)));
+                                    hbox.Add(indicator = new Label(colWidth, hbox.RemainingHeight, LastCol.Substring(iniLastCol, Viewer.Catalog.GetString(LastCol).Length - iniLastCol).TrimStart()));
+                                }
+                                else
+                                {
+                                    hbox.Add(indicator = new Label(colWidth, hbox.RemainingHeight, LastCol));
+                                }
                                 indicator.Color = Color.White; // Default color
                             }
                         }
@@ -839,7 +865,6 @@ void AddSeparator() => AddLabel(new ListLabel
                         index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("BC"));
 
                     brakeInfoValue = trainBrakeStatus.Substring(index, trainBrakeStatus.Length - index).TrimEnd();
-                    brakeInfoValue = brakeInfoValue.StartsWith(Viewer.Catalog.GetString("V")) ? brakeInfoValue.Replace(Viewer.Catalog.GetString("V"), Viewer.Catalog.GetString("V") + "  ") : brakeInfoValue;
                     AddLabel(new ListLabel
                     {
                         LastCol = brakeInfoValue,