From 04932e960ae68a820522352d89d6d42965971d3d Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Tue, 4 Jun 2019 15:31:46 +0300 Subject: [PATCH] (5b6f8ab90) Assign displayModeDD.OnSelected before adding items to it --- .../BarotraumaClient/Source/GameSettings.cs | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs index cea6be3d5..d306415c2 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs @@ -224,22 +224,6 @@ namespace Barotrauma new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), TextManager.Get("DisplayMode")); var displayModeDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform)); - displayModeDD.AddItem(TextManager.Get("Fullscreen"), WindowMode.Fullscreen); - displayModeDD.AddItem(TextManager.Get("Windowed"), WindowMode.Windowed); -#if (!OSX) - displayModeDD.AddItem(TextManager.Get("BorderlessWindowed"), WindowMode.BorderlessWindowed); - displayModeDD.SelectItem(GameMain.Config.WindowMode); -#else - // Fullscreen option will just set itself to borderless on macOS. - if (GameMain.Config.WindowMode == WindowMode.BorderlessWindowed) - { - displayModeDD.SelectItem(WindowMode.Fullscreen); - } - else - { - displayModeDD.SelectItem(GameMain.Config.WindowMode); - } -#endif displayModeDD.OnSelected = (guiComponent, obj) => { UnsavedSettings = true; @@ -258,6 +242,24 @@ namespace Barotrauma return true; }; + + displayModeDD.AddItem(TextManager.Get("Fullscreen"), WindowMode.Fullscreen); + displayModeDD.AddItem(TextManager.Get("Windowed"), WindowMode.Windowed); +#if (!OSX) + displayModeDD.AddItem(TextManager.Get("BorderlessWindowed"), WindowMode.BorderlessWindowed); + displayModeDD.SelectItem(GameMain.Config.WindowMode); +#else + // Fullscreen option will just set itself to borderless on macOS. + if (GameMain.Config.WindowMode == WindowMode.BorderlessWindowed) + { + displayModeDD.SelectItem(WindowMode.Fullscreen); + } + else + { + displayModeDD.SelectItem(GameMain.Config.WindowMode); + } +#endif + GUITickBox vsyncTickBox = new GUITickBox(new RectTransform(new Point(32, 32), leftColumn.RectTransform), TextManager.Get("EnableVSync")) { ToolTip = TextManager.Get("EnableVSyncToolTip"), @@ -532,6 +534,10 @@ namespace Barotrauma voiceMode.AddRadioButton((VoiceMode)i, tick); } + deviceList.OnSelected = (GUIComponent selected, object obj) => + { + string name = obj as string; + if (VoiceCaptureDevice == name) { return true; } var micVolumeText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform), TextManager.Get("MicrophoneVolume")); var micVolumeSlider = new GUIScrollBar(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform),