Skip to content

Commit

Permalink
Automatic merge of T1.5.1-1450-g20e879b39 and 15 pull requests
Browse files Browse the repository at this point in the history
- Pull request #1022 at efe1fd7: Fix invalid brake controller detection
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #961 at 8a9c8f9: Improvements for Power Supplies
- Pull request #981 at 1c53db2: Multiple type trainset lightglows
- Pull request #996 at 2fcbcde: Replace dynamic brakes by engine brakes at low speeds
- Pull request #1009 at 80172b8: Fix: TrainCarViewer overlaps when display size changed
- Pull request #1010 at 6a1060f: Fix: TrainDrivingInfo window width not stable.
- Pull request #1012 at 33f692f: doc:adds 3 news items to Manual
- Pull request #1015 at 266e9ca: Enhancements for EP brakes
- Pull request #1021 at 0f744b3: Various traincar operations windows fixes
- Pull request #1023 at 2f9061c: Fix: Adjusts division in F1 command window for longer descriptions
- Pull request #900 at c27f32d: DMI updates
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #1016 at 5a94c4e: Route all logging via Trace #or-std-log
  • Loading branch information
openrails-bot committed Dec 29, 2024
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Source/RunActivity/Viewer3D/Popups/HelpWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ public HelpWindow(WindowManager owner)
foreach (UserCommand command in Enum.GetValues(typeof(UserCommand)))
{
var line = scrollbox.AddLayoutHorizontalLineOfText();
var width = line.RemainingWidth / 2;
line.Add(new Label(width, line.RemainingHeight, InputSettings.GetPrettyLocalizedName(command)));
line.Add(new Label(width, line.RemainingHeight, Owner.Viewer.Settings.Input.Commands[(int)command].ToString()));
var width = line.RemainingWidth / 2; // Split pane into 2 equal parts
var offset = (int)(line.RemainingWidth * 0.10); // Offset pushes command keys 10% rightwards to allow for longer command descriptions.
line.Add(new Label(width + offset, line.RemainingHeight, InputSettings.GetPrettyLocalizedName(command)));
line.Add(new Label(width - offset, line.RemainingHeight, Owner.Viewer.Settings.Input.Commands[(int)command].ToString()));
}
}));
if (owner.Viewer.Simulator.Activity != null)
Expand Down

0 comments on commit 50b9d0a

Please sign in to comment.