Skip to content

Commit 49f84f2

Browse files
author
Chris Jakeman
committed
Moves WindowGlass control to System tab
1 parent 4ae28a0 commit 49f84f2

File tree

3 files changed

+69
-41
lines changed

3 files changed

+69
-41
lines changed

Source/Documentation/Manual/options.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,6 @@ Note: This may reduce the frame rate.
218218
Note: Static objects provided with shadows (in the World files)
219219
will cast shadows anyway. This option adds shadows for other static objects.
220220

221-
Glass on in-game windows
222-
------------------------
223-
224-
When this option is checked, the in-game windows are displayed in a
225-
semitransparent mode.
226-
227221
Model instancing
228222
----------------
229223

@@ -537,6 +531,8 @@ System Options
537531
These options control which OR version update channel is active (see also
538532
:ref:`here <updating-or>`). The various options available are self-explanatory.
539533

534+
.. _options-windowed:
535+
540536
Windowed
541537
--------
542538
If the ``Windowed`` checkbox is checked, Open Rails will run in a window
@@ -555,6 +551,13 @@ specific width and height to be used.
555551

556552
The format is <width>x<height>, for example 1024x768.
557553

554+
.. _options-window-glass:
555+
556+
Glass on in-game windows
557+
------------------------
558+
559+
When this option is checked, the in-game windows are displayed in a
560+
semitransparent mode.
558561

559562

560563
.. _options-experimental:

Source/Menu/Options.Designer.cs

Lines changed: 52 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/Options.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
159159
// Video tab
160160
checkDynamicShadows.Checked = Settings.DynamicShadows;
161161
checkShadowAllShapes.Checked = Settings.ShadowAllShapes;
162-
checkWindowGlass.Checked = Settings.WindowGlass;
163162
checkModelInstancing.Checked = Settings.ModelInstancing;
164163
checkWire.Checked = Settings.Wire;
165164
checkVerticalSync.Checked = Settings.VerticalSync;
@@ -304,6 +303,8 @@ orderby folder.Key
304303

305304
checkWindowed.Checked = !Settings.FullScreen;
306305
comboWindowSize.Text = Settings.WindowSize;
306+
checkWindowGlass.Checked = Settings.WindowGlass;
307+
307308

308309

309310

@@ -443,7 +444,6 @@ void buttonOK_Click(object sender, EventArgs e)
443444
// Video tab
444445
Settings.DynamicShadows = checkDynamicShadows.Checked;
445446
Settings.ShadowAllShapes = checkShadowAllShapes.Checked;
446-
Settings.WindowGlass = checkWindowGlass.Checked;
447447
Settings.ModelInstancing = checkModelInstancing.Checked;
448448
Settings.Wire = checkWire.Checked;
449449
Settings.VerticalSync = checkVerticalSync.Checked;
@@ -500,6 +500,7 @@ void buttonOK_Click(object sender, EventArgs e)
500500
UpdateManager.SetChannel((string)control.Tag);
501501
Settings.FullScreen = !checkWindowed.Checked;
502502
Settings.WindowSize = GetValidWindowSize(comboWindowSize.Text);
503+
Settings.WindowGlass = checkWindowGlass.Checked;
503504

504505
// Experimental tab
505506
Settings.UseSuperElevation = (int)numericUseSuperElevation.Value;
@@ -834,6 +835,7 @@ private void InitializeHelpIcons()
834835
(pbLanguage, new Control[] { labelLanguage, comboLanguage }),
835836
(pbUpdateMode, new Control[] { labelUpdateMode }),
836837
(pbWindowed, new Control[] { checkWindowed, labelWindowSize, comboWindowSize }),
838+
(pbWindowGlass, new[] { checkWindowGlass }),
837839
};
838840
foreach ((PictureBox pb, Control[] controls) in helpIconControls)
839841
{
@@ -903,6 +905,10 @@ private void HelpIcon_Click(object sender, EventArgs _)
903905
pbWindowed,
904906
baseUrl + "/options.html#windowed"
905907
},
908+
{
909+
pbWindowGlass,
910+
baseUrl + "/options.html#window-glass"
911+
},
906912
};
907913
if (urls.TryGetValue(sender, out var url))
908914
{

0 commit comments

Comments
 (0)