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

Fixed GUIMessageBoxes being impossible to close in the launcher

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-24 17:03:13 +03:00
parent 446dce9545
commit d007301fc4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/Launcher/LauncherMain.cs
+5 -3
View File
@@ -197,7 +197,8 @@ namespace Launcher
if (GUIMessageBox.VisibleBox != null) if (GUIMessageBox.VisibleBox != null)
{ {
GUIComponent.ForceMouseOn(GUIMessageBox.VisibleBox); GUIMessageBox.VisibleBox.AddToGUIUpdateList();
GUIComponent.UpdateMouseOn();
GUIMessageBox.VisibleBox.Update(deltaTime); GUIMessageBox.VisibleBox.Update(deltaTime);
return; return;
} }
@@ -580,7 +581,8 @@ namespace Launcher
private void ShowError(string header, string message) private void ShowError(string header, string message)
{ {
GUIFrame dummyFrame = new GUIFrame(new Rectangle(0,0,graphicsWidth,graphicsHeight)); GUIFrame dummyFrame = new GUIFrame(new Rectangle(0, 0, graphicsWidth, graphicsHeight));
dummyFrame.Padding = Vector4.Zero;
GUIMessageBox errorBox = new GUIMessageBox(header, message, new string[] { "OK" }, 400, 250, Alignment.TopLeft, dummyFrame); GUIMessageBox errorBox = new GUIMessageBox(header, message, new string[] { "OK" }, 400, 250, Alignment.TopLeft, dummyFrame);
errorBox.Buttons[0].OnClicked = errorBox.Close; errorBox.Buttons[0].OnClicked = errorBox.Close;
@@ -598,9 +600,9 @@ namespace Launcher
Alignment.TopLeft, Alignment.TopLeft, Alignment.TopLeft, Alignment.TopLeft,
updateInfoBox, true, GUI.SmallFont); updateInfoBox, true, GUI.SmallFont);
textBlock.TextColor = Color.Red; textBlock.TextColor = Color.Red;
//textBlock.CanBeFocused = false;
GUIFrame dummyFrame = new GUIFrame(new Rectangle(0, 0, graphicsWidth, graphicsHeight)); GUIFrame dummyFrame = new GUIFrame(new Rectangle(0, 0, graphicsWidth, graphicsHeight));
dummyFrame.Padding = Vector4.Zero;
GUIMessageBox errorBox = new GUIMessageBox("Error while updating", "Downloading the update failed.", GUIMessageBox errorBox = new GUIMessageBox("Error while updating", "Downloading the update failed.",
new string[] { "Retry", "Cancel" }, 400, 250, Alignment.TopLeft, dummyFrame); new string[] { "Retry", "Cancel" }, 400, 250, Alignment.TopLeft, dummyFrame);