Last control was not displayed as a ctrl-F5 rectangle

sweiland-openrails · sweiland-openrails · commit e6c08a220080 · 2024-03-10T10:26:45.000+01:00
diff --git a/Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs b/Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs
@@ -45,8 +45,8 @@ public override void Draw(SpriteBatch spriteBatch)
 
                 var loco = Viewer.PlayerLocomotive as MSTSLocomotive;
                 var cabViewFrontRear = loco.UsingRearCab ? 1 : 0;
-                var itemsFrontCount = loco.CabViewList[(int)CabViewType.Front].CVFFile.CabViewControls.Count() - 1;
-                var itemsRearCount = loco.CabViewList.Count > 1 ? loco.CabViewList[(int)CabViewType.Rear].CVFFile.CabViewControls.Count() - 1 : 0;
+                var itemsFrontCount = loco.CabViewList[(int)CabViewType.Front].CVFFile.CabViewControls.Count();
+                var itemsRearCount = loco.CabViewList.Count > 1 ? loco.CabViewList[(int)CabViewType.Rear].CVFFile.CabViewControls.Count() : 0;
                 
                 foreach (var controlRenderer in cabRenderer.ControlMap.Values.Skip(cabViewFrontRear == 0 ? 0 : itemsFrontCount).Take(cabViewFrontRear == 0 ? itemsFrontCount : itemsRearCount))
                 {

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public override void Draw(SpriteBatch spriteBatch)`
`45`	`45`
`46`	`46`	`var loco = Viewer.PlayerLocomotive as MSTSLocomotive;`
`47`	`47`	`var cabViewFrontRear = loco.UsingRearCab ? 1 : 0;`
`48`		`- var itemsFrontCount = loco.CabViewList[(int)CabViewType.Front].CVFFile.CabViewControls.Count() - 1;`
`49`		`- var itemsRearCount = loco.CabViewList.Count > 1 ? loco.CabViewList[(int)CabViewType.Rear].CVFFile.CabViewControls.Count() - 1 : 0;`
	`48`	`+ var itemsFrontCount = loco.CabViewList[(int)CabViewType.Front].CVFFile.CabViewControls.Count();`
	`49`	`+ var itemsRearCount = loco.CabViewList.Count > 1 ? loco.CabViewList[(int)CabViewType.Rear].CVFFile.CabViewControls.Count() : 0;`
`50`	`50`
`51`	`51`	`foreach (var controlRenderer in cabRenderer.ControlMap.Values.Skip(cabViewFrontRear == 0 ? 0 : itemsFrontCount).Take(cabViewFrontRear == 0 ? itemsFrontCount : itemsRearCount))`
`52`	`52`	`{`