Skip to content

Commit 8f695a4

Browse files
committed
Unused TabAction() removed.
1 parent ae1cffb commit 8f695a4

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs

Lines changed: 1 addition & 12 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();
@@ -746,4 +735,4 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
746735
.Where((UserCommand key) => UserInput.IsDown(key))
747736
.FirstOrDefault();
748737
}
749-
}
738+
}

Source/RunActivity/Viewer3D/Viewer.cs

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

10161016
if (UserInput.IsPressed(UserCommand.DisplayTrainCarOperationsWindow))
10171017
{
1018-
if (UserInput.IsDown(UserCommand.DisplayNextWindowTab))
1019-
TrainCarOperationsWindow.TabAction();
1020-
else
1018+
TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible;
1019+
if (!TrainCarOperationsWindow.Visible)
10211020
{
1022-
TrainCarOperationsWindow.Visible = !TrainCarOperationsWindow.Visible;
1023-
if (!TrainCarOperationsWindow.Visible)
1024-
{
1025-
TrainCarOperationsViewerWindow.Visible = false;
1026-
CarOperationsWindow.Visible = false;
1027-
}
1021+
TrainCarOperationsViewerWindow.Visible = false;
1022+
CarOperationsWindow.Visible = false;
10281023
}
10291024
}
10301025

1031-
if (UserInput.IsPressed(UserCommand.DisplayTrainDpuWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TrainDpuWindow.Visible = !TrainDpuWindow.Visible ; else TrainDpuWindow.TabAction();
1026+
if (UserInput.IsPressed(UserCommand.DisplayTrainDpuWindow)) TrainDpuWindow.Visible = !TrainDpuWindow.Visible;
1027+
10321028
if (UserInput.IsPressed(UserCommand.DisplayNextStationWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) NextStationWindow.TabAction(); else NextStationWindow.Visible = !NextStationWindow.Visible;
10331029
if (UserInput.IsPressed(UserCommand.DisplayCompassWindow)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) CompassWindow.TabAction(); else CompassWindow.Visible = !CompassWindow.Visible;
10341030
if (UserInput.IsPressed(UserCommand.DebugTracks)) if (UserInput.IsDown(UserCommand.DisplayNextWindowTab)) TracksDebugWindow.TabAction(); else TracksDebugWindow.Visible = !TracksDebugWindow.Visible;

0 commit comments

Comments
 (0)