From c1840327d0d86f25e0cc822392df8506cbcd6996 Mon Sep 17 00:00:00 2001 From: in0finite Date: Sun, 28 Jul 2019 23:29:18 +0200 Subject: [PATCH] Loader: display error in text area ; display exit button below error --- Assets/Scripts/Behaviours/Loader.cs | 10 ++++++++-- Docs/TODO.md | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Behaviours/Loader.cs b/Assets/Scripts/Behaviours/Loader.cs index 9e2e1962..9475acf3 100644 --- a/Assets/Scripts/Behaviours/Loader.cs +++ b/Assets/Scripts/Behaviours/Loader.cs @@ -454,7 +454,7 @@ namespace SanAndreasUnity.Behaviours // display loading progress - GUILayout.BeginArea(new Rect(10, 5, 400, Screen.height)); + GUILayout.BeginArea(new Rect(10, 5, 400, Screen.height - 5)); // current status GUILayout.Label("" + LoadingStatus + ""); @@ -466,7 +466,13 @@ namespace SanAndreasUnity.Behaviours // display error if (m_hasErrors) { GUILayout.Space (20); - GUILayout.Label("" + "The following exception occured during the current step:\n" + "" + m_loadException.ToString ()); + GUILayout.Label("" + "The following exception occured during the current step:" + ""); + GUILayout.TextArea( m_loadException.ToString () ); + GUILayout.Space (30); + if (GUIUtils.ButtonWithCalculatedSize("Exit", 80, 30)) { + GameManager.ExitApplication(); + } + GUILayout.Space(5); } // display all steps diff --git a/Docs/TODO.md b/Docs/TODO.md index 2d4a6ac6..3a7a3b37 100644 --- a/Docs/TODO.md +++ b/Docs/TODO.md @@ -25,7 +25,7 @@ - Chat -- Android: set font size to 23 ; adapt UI: options (save, load, size), Utilities size, file browser size ; sliders should be larger ; camera zoom should be configurable (no need for persistence) ; use unsigned (debug) key alias ; increment build number ; test at 800x480 resolution ; +- Android: set font size to 23 ; adapt UI: options (save, load, size), Utilities size, file browser size ; sliders should be larger ; camera zoom should be configurable (no need for persistence) ; use unsigned (debug) key alias ; increment build number ; test at 800x480 resolution ; test Loader error displaying ; - Touch input: