Automatic merge of T1.6-rc7-43-ge3d1d75f9 and 15 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast
- Pull request #1151 at 25d2f29: fix: Do not allow non-ACE/DDS textures in content
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts)
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

Source/RunActivity/Viewer3D/Popups/HelpWindow.cs

@@ -1419,6 +1419,18 @@ public override void TabAction()
 
         protected override ControlLayout Layout(ControlLayout layout)
         {
+            int scrollPosition = 0;
+            if (Tabs[ActiveTab].Vbox != null)
+            {
+                foreach (var control in Tabs[ActiveTab].Vbox.Controls)
+                {
+                    if (control is ControlLayoutScrollboxVertical controlLayoutScrollboxVertical)
+                    {
+                        scrollPosition = controlLayoutScrollboxVertical.GetScrollPosition();
+                    }
+                }
+            }
+
             var vbox = base.Layout(layout).AddLayoutVertical();
 
             if (Tabs.Count > 0)
@@ -1434,8 +1446,17 @@ protected override ControlLayout Layout(ControlLayout layout)
                 }
                 vbox.AddHorizontalSeparator();
                 Tabs[ActiveTab].Layout(vbox);
+
+                foreach (var control in vbox.Controls)
+                {
+                    if (control is ControlLayoutScrollboxVertical controlLayoutScrollboxVertical)
+                    {
+                        controlLayoutScrollboxVertical.SetScrollPosition(scrollPosition);
+                    }
+                }
             }
 
+            Tabs[ActiveTab].Vbox = vbox;
             return vbox;
         }
 
@@ -1462,12 +1483,14 @@ class TabData
             public readonly Tab Tab;
             public readonly string TabLabel;
             public readonly Action<ControlLayout> Layout;
+            public Orts.Viewer3D.Popups.ControlLayoutVertical Vbox;
 
             public TabData(Tab tab, string tabLabel, Action<ControlLayout> layout)
             {
                 Tab = tab;
                 TabLabel = tabLabel;
                 Layout = layout;
+                Vbox = null;
             }
         }
 

Source/RunActivity/Viewer3D/Popups/WindowControls.cs

@@ -587,6 +587,7 @@ protected ControlLayoutScrollbox(int width, int height)
 
         public abstract int ScrollSize { get; }
 
+        public abstract int GetScrollPosition();
         public abstract void SetScrollPosition(int position);
 
         internal RasterizerState ScissorTestEnable = new RasterizerState { ScissorTestEnable = true };
@@ -707,6 +708,11 @@ public override int ScrollSize
             }
         }
 
+        public override int GetScrollPosition()
+        {
+            return ScrollPosition;
+        }
+
         public override void SetScrollPosition(int position)
         {
             position = Math.Max(0, Math.Min(Math.Max(0, ScrollSize), position));
@@ -841,6 +847,11 @@ public override int ScrollSize
             }
         }
 
+        public override int GetScrollPosition()
+        {
+            return(ScrollPosition);
+        }
+
         public override void SetScrollPosition(int position)
         {
             position = Math.Max(0, Math.Min(Math.Max(0, ScrollSize), position));