Fix-Layout-scroll-sync-with-Alt-keys

Author: mbm-OR

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -74,20 +74,20 @@ public class TrainCarOperationsViewerWindow : Window
         internal static Texture2D ResetBrakesOff;
         internal static Texture2D ResetBrakesOn;
 
-        public int WindowHeightMin;
-        public int WindowHeightMax;
-        public int WindowWidthMin;
-        public int WindowWidthMax;
-        public string PowerSupplyStatus;
         public string BatteryStatus;
         string CircuitBreakerState;
-        public int SpacerRowCount;
-        public int SymbolsRowCount;
         public int LocoRowCount;
+        public string PowerSupplyStatus;
         public int RowsCount;
+        public int SpacerRowCount;
+        public int SymbolsRowCount;
         const int SymbolWidth = 32;
         public static bool FontChanged;
         public static bool FontToBold;
+        public int WindowHeightMin;
+        public int WindowHeightMax;
+        public int WindowWidthMin;
+        public int WindowWidthMax;
         public int windowHeight { get; set; } //required by TrainCarWindow
         public int CarPosition
         {
@@ -132,10 +132,10 @@ public struct ListLabel
         public List<ListLabel> Labels = new List<ListLabel>();
 
         Train PlayerTrain;
-        int LastPlayerTrainCars;
         bool LastPlayerLocomotiveFlippedState;
+        int LastPlayerTrainCars;
         int OldCarPosition;
-        bool ResetAllSymbols = false;
+        bool ResetAllSymbols;
         public TrainCarOperationsViewerWindow(WindowManager owner)
             : base(owner, Window.DecorationSize.X + CarListPadding + ((owner.TextFontDefault.Height + 12) * 20), Window.DecorationSize.Y + ((owner.TextFontDefault.Height + 12) * 2), Viewer.Catalog.GetString("Train Operations Viewer"))
         {
@@ -375,11 +375,19 @@ void buttonClose_Click(Control arg1, Point arg2)
         public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
         {
             base.PrepareFrame(elapsedTime, updateFull);
+            if (UserInput.IsPressed(UserCommand.CameraCarNext) && CarPosition > 0)
+                CarPosition--;
+            else if (UserInput.IsPressed(UserCommand.CameraCarPrevious) && CarPosition < Owner.Viewer.PlayerTrain.Cars.Count - 1)
+                CarPosition++;
+            else if (UserInput.IsPressed(UserCommand.CameraCarFirst))
+                CarPosition = 0;
+            else if (UserInput.IsPressed(UserCommand.CameraCarLast))
+                CarPosition = Owner.Viewer.PlayerTrain.Cars.Count - 1;
 
             if (updateFull)
             {
                 var carOperations = Owner.Viewer.CarOperationsWindow;
-                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;                
+                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;
 
                 if (CouplerChanged || PlayerTrain != Owner.Viewer.PlayerTrain || Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars || (Owner.Viewer.PlayerLocomotive != null &&
                 LastPlayerLocomotiveFlippedState != Owner.Viewer.PlayerLocomotive.Flipped))

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -71,43 +71,44 @@ public class TrainCarOperationsWindow : Window
         internal static Texture2D RearAngleCockClosed;
         internal static Texture2D RearAngleCockOpened;
 
-        public int DisplaySizeY;
-        public bool LayoutUpdated = false;
         public bool AllSymbolsMode = true;
+        public int DisplaySizeY;
+        public bool LayoutUpdated;
         public int LocoRowCount;
         public int RowsCount;
         public int SeparatorCount;
         public int SpacerRowCount;
         public int SymbolsRowCount;
 
-        public int CarPositionVisible;
         public ControlLayout Client;
+        public bool CarPositionChanged;
+        public int CarPositionVisible;
         public int CurrentCarPosition;
         public int LabelTop;
-        public bool LastRowVisible = false;
+        public bool LastRowVisible;
         public int LocalScrollPosition;
         public int SelectedCarPosition;
         const int SymbolSize = 16;
 
+        public int CurrentDisplaySizeY;
+        public bool IsFullScreen;
+        public int OldPositionHeight;
+        public int RowHeight;
+        public bool UpdateTrainCarOperation;
         public int WindowHeightMax;
         public int WindowHeightMin;
         public int WindowWidthMax;
         public int WindowWidthMin;
-        public int CurrentDisplaySizeY;
-        public bool IsFullScreen = false;
-        public int RowHeight;
-        public int OldPositionHeight;
-        public bool UpdateTrainCarOperation = false;
         public List<int> LabelPositionTop = new List<int>();
 
         //Rectangle carLabelPosition;
+        public ControlLayoutVertical Vbox;
         public string CarLabelText;
         public int CarPosition;
         public int CarUIDLenght;
         public int DesiredHeight;
         public static bool FontChanged;
         public static bool FontToBold;
-        public ControlLayoutVertical Vbox;
 
         //Electrical power
         public string BatteryStatus;
@@ -116,10 +117,10 @@ public class TrainCarOperationsWindow : Window
         public string PowerSupplyStatus;
         public bool PowerSupplyUpdating;
         public bool SupplyStatusChanged;
-        public bool UpdatingPowerSupply = false;
+        public bool UpdatingPowerSupply;
 
-        public bool WarningEnabled = false;
-        public bool CarIdClicked = false;
+        public bool CarIdClicked;
+        public bool WarningEnabled;
         public bool ModifiedSetting
         {
             set;
@@ -460,7 +461,7 @@ public void topCarPositionVisible()
                             break;
                         }
                     }
-                }               
+                }
             }
         }
         public void localScrollLayout(int selectedCarPosition)
@@ -502,6 +503,9 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
         {
             base.PrepareFrame(elapsedTime, updateFull);
 
+            if (UserInput.IsPressed(UserCommand.CameraCarNext) || UserInput.IsPressed(UserCommand.CameraCarPrevious) || UserInput.IsPressed(UserCommand.CameraCarFirst) || UserInput.IsPressed(UserCommand.CameraCarLast))
+                CarPositionChanged = true;
+
             if (updateFull)
             {
                 var trainCarViewer = Owner.Viewer.TrainCarOperationsViewerWindow;
@@ -580,14 +584,16 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                     carOperations.CarOperationChanged = carOperations.Visible && carOperations.CarOperationChanged;
                 }
 
-                if (trainCarWebpage != null && CarPosition != trainCarViewer.CarPosition && trainCarWebpage.Connections > 0)
+                if (CarPositionChanged || (trainCarWebpage != null && CarPosition != trainCarViewer.CarPosition && trainCarWebpage.Connections > 0))
                 {
                     // Required to scroll the main window from the web version
                     UpdateTrainCarOperation = true;
                     CarPosition = trainCarViewer.CarPosition;
+                    SelectedCarPosition = CarPositionChanged ? CarPosition : SelectedCarPosition;
                     LabelTop = LabelPositionTop[SelectedCarPosition];
                     Layout();
                     localScrollLayout(SelectedCarPosition);
+                    CarPositionChanged = false;
                 }
                 //Resize this window after the font has been changed externally
                 else if (MultiPlayerWindow.FontChanged)