(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?
This commit is contained in:
@@ -55,12 +55,6 @@ namespace Barotrauma
|
|||||||
RelativeSpacing = 0.03f
|
RelativeSpacing = 0.03f
|
||||||
};
|
};
|
||||||
|
|
||||||
GUIListBox infoTextBox = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.7f), paddedFrame.RectTransform));
|
|
||||||
|
|
||||||
string summaryText = TextManager.GetWithVariables(gameOver ? "RoundSummaryGameOver" :
|
|
||||||
(progress ? "RoundSummaryProgress" : "RoundSummaryReturn"), new string[2] { "[sub]", "[location]" },
|
|
||||||
new string[2] { Submarine.MainSub.Name, progress ? GameMain.GameSession.EndLocation.Name : GameMain.GameSession.StartLocation.Name });
|
|
||||||
|
|
||||||
var infoText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform),
|
var infoText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoTextBox.Content.RectTransform),
|
||||||
summaryText, wrap: true);
|
summaryText, wrap: true);
|
||||||
|
|
||||||
|
|||||||
@@ -207,9 +207,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 !LINUX
|
|
||||||
ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed
|
ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (DisplayMode mode in supportedDisplayModes)
|
foreach (DisplayMode mode in supportedDisplayModes)
|
||||||
|
|||||||
@@ -199,6 +199,10 @@ namespace Barotrauma
|
|||||||
UserData = "noresults"
|
UserData = "noresults"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
joinButton.Enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -559,6 +563,13 @@ namespace Barotrauma
|
|||||||
.Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
|
.Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
|
||||||
.Replace("[statusdescription]", masterServerResponse.StatusDescription));
|
.Replace("[statusdescription]", masterServerResponse.StatusDescription));
|
||||||
break;
|
break;
|
||||||
|
case System.Net.HttpStatusCode.ServiceUnavailable:
|
||||||
|
new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
|
||||||
|
TextManager.Get("MasterServerErrorUnavailable")
|
||||||
|
.Replace("[masterserverurl]", NetConfig.MasterServerUrl)
|
||||||
|
.Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
|
||||||
|
.Replace("[statusdescription]", masterServerResponse.StatusDescription));
|
||||||
|
break;
|
||||||
case System.Net.HttpStatusCode.ServiceUnavailable:
|
case System.Net.HttpStatusCode.ServiceUnavailable:
|
||||||
new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
|
new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
|
||||||
TextManager.Get("MasterServerErrorUnavailable"));
|
TextManager.Get("MasterServerErrorUnavailable"));
|
||||||
|
|||||||
Reference in New Issue
Block a user