Skip to content

Commit 49cb790

Browse files
committed
Automatic merge of T1.5.1-1004-g6fd841761e and 18 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #885 at 2728d6d: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at 359cfee: New Triple Valve Features Vol. 2 - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #949 at aac0de8: Oil Burning Locomotive - Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1 - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #956 at 25193a8: Map settings saved
20 parents eeb2f98 + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + aac0de8 + b2af1f5 + a519452 + 84c2f4b + 25193a8 commit 49cb790

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -340,17 +340,6 @@ void VerticalWindow_Click(Control arg1, Point arg2)
340340
UpdateWindowSize();
341341
}
342342

343-
public override void TabAction() => CycleMode();
344-
345-
/// <summary>
346-
/// Change between full and abbreviated text mode.
347-
/// </summary>
348-
public void CycleMode()
349-
{
350-
normalTextMode = !normalTextMode;
351-
UpdateWindowSize();
352-
}
353-
354343
private void UpdateWindowSize()
355344
{
356345
labels = TrainDPUWindowList(Owner.Viewer, normalTextMode).ToList();

Source/RunActivity/Viewer3D/Viewer.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,20 +1038,16 @@ void HandleUserInput(ElapsedTime elapsedTime)
10381038

10391039
if (UserInput.IsPressed(UserCommand.DisplayTrainCarOperationsWindow))
10401040
{
1041-
if (UserInput.IsDown(UserCommand.DisplayNextWindowTab))
1042-
TrainCarOperationsWindow.TabAction();
1043-
else
1041+
TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible;
1042+
if (!TrainCarOperationsWindow.Visible)
10441043
{
1045-
TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible;
1046-
if (!TrainCarOperationsWindow.Visible)
1047-
{
1048-
TrainCarOperationsViewerWindow.Visible = false;
1049-
CarOperationsWindow.Visible = false;
1050-
}
1044+
TrainCarOperationsViewerWindow.Visible = false;
1045+
CarOperationsWindow.Visible = false;
10511046
}
10521047
}
10531048

1054-
if (UserInput.IsPressed(UserCommand.DisplayTrainDpuWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainDpuWindow.Visible = !TrainDpuWindow.Visible ; else TrainDpuWindow.TabAction();
1049+
if (UserInput.IsPressed(UserCommand.DisplayTrainDpuWindow)) TrainDpuWindow.Visible = !TrainDpuWindow.Visible;
1050+
10551051
if (UserInput.IsPressed(UserCommand.DisplayNextStationWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) NextStationWindow.TabAction(); else NextStationWindow.Visible = !NextStationWindow.Visible;
10561052
if (UserInput.IsPressed(UserCommand.DisplayCompassWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) CompassWindow.TabAction(); else CompassWindow.Visible = !CompassWindow.Visible;
10571053
if (UserInput.IsPressed(UserCommand.DebugTracks)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TracksDebugWindow.TabAction(); else TracksDebugWindow.Visible = !TracksDebugWindow.Visible;

0 commit comments

Comments
 (0)