vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(450a14ae6) Resolution button is locked on Windows when in borderless windowed.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-23 11:19:45 +03:00
parent b5cc00810d
commit 1e02bf9d36
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GameSettings.cs
+5 -5
View File
@@ -163,7 +163,7 @@ namespace Barotrauma
{ {
UserData = tab UserData = tab
}; };
tabButtons[(int)tab] = new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), tabButtonHolder.RectTransform), tabButtons[(int)tab] = new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), tabButtonHolder.RectTransform),
TextManager.Get("SettingsTab." + tab.ToString()), style: "GUITabButton") TextManager.Get("SettingsTab." + tab.ToString()), style: "GUITabButton")
{ {
UserData = tab, UserData = tab,
@@ -201,7 +201,7 @@ namespace Barotrauma
var resolutionDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), elementCount: supportedDisplayModes.Count) var resolutionDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), elementCount: supportedDisplayModes.Count)
{ {
OnSelected = SelectResolution, OnSelected = SelectResolution,
#if OSX #if !LINUX
ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed
#endif #endif
}; };
@@ -241,7 +241,7 @@ namespace Barotrauma
{ {
UnsavedSettings = true; UnsavedSettings = true;
GameMain.Config.WindowMode = (WindowMode)guiComponent.UserData; GameMain.Config.WindowMode = (WindowMode)guiComponent.UserData;
#if OSX #if !LINUX
resolutionDD.ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed; resolutionDD.ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed;
#endif #endif
return true; return true;
@@ -437,7 +437,7 @@ namespace Barotrauma
UnsavedSettings = true; UnsavedSettings = true;
return true; return true;
}; };
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform), TextManager.Get("VoiceChat")); new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform), TextManager.Get("VoiceChat"));
IList<string> deviceNames = Alc.GetString((IntPtr)null, AlcGetStringList.CaptureDeviceSpecifier); IList<string> deviceNames = Alc.GetString((IntPtr)null, AlcGetStringList.CaptureDeviceSpecifier);
@@ -646,7 +646,7 @@ namespace Barotrauma
return true; return true;
} }
}; };
var inputFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.75f), controlsLayoutGroup.RectTransform), isHorizontal: true) var inputFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.75f), controlsLayoutGroup.RectTransform), isHorizontal: true)
{ Stretch = true, RelativeSpacing = 0.03f }; { Stretch = true, RelativeSpacing = 0.03f };