From 96dea304808242a2fdff12acbf6774c0c059e629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= <lbphacker@gmail.com>
Date: Sun, 12 Feb 2023 09:00:16 +0100
Subject: [PATCH] Emscripten: Remove all other blocking prompt calls

---
 src/PowderToy.cpp                           |  5 ++-
 src/gui/filebrowser/FileBrowserActivity.cpp | 39 ++++++++++++---------
 src/gui/game/GameView.cpp                   | 22 +++++-------
 src/gui/preview/PreviewView.cpp             |  5 +--
 src/gui/profile/ProfileActivity.cpp         |  5 +--
 5 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/PowderToy.cpp b/src/PowderToy.cpp
index 3c74529b2..ed6f5adf0 100644
--- a/src/PowderToy.cpp
+++ b/src/PowderToy.cpp
@@ -83,11 +83,10 @@ void LargeScreenDialog()
 	message << "Switching to " << scale << "x size mode since your screen was determined to be large enough: ";
 	message << desktopWidth << "x" << desktopHeight << " detected, " << WINDOWW*scale << "x" << WINDOWH*scale << " required";
 	message << "\nTo undo this, hit Cancel. You can change this in settings at any time.";
-	if (!ConfirmPrompt::Blocking("Large screen detected", message.Build()))
-	{
+	new ConfirmPrompt("Large screen detected", message.Build(), { nullptr, []() {
 		GlobalPrefs::Ref().Set("Scale", 1);
 		ui::Engine::Ref().SetScale(1);
-	}
+	} });
 }
 
 void TickClient()
diff --git a/src/gui/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp
index 668e811e1..28dd94345 100644
--- a/src/gui/filebrowser/FileBrowserActivity.cpp
+++ b/src/gui/filebrowser/FileBrowserActivity.cpp
@@ -141,29 +141,36 @@ void FileBrowserActivity::SelectSave(int index)
 
 void FileBrowserActivity::DeleteSave(int index)
 {
-	auto &file = files[index];
-	String deleteMessage = "Are you sure you want to delete " + file->GetDisplayName() + ".cps?";
-	if (ConfirmPrompt::Blocking("Delete Save", deleteMessage))
-	{
+	String deleteMessage = "Are you sure you want to delete " + files[index]->GetDisplayName() + ".cps?";
+	new ConfirmPrompt("Delete Save", deleteMessage, { [this, index]() {
+		auto &file = files[index];
 		Platform::RemoveFile(file->GetName());
 		loadDirectory(directory, "");
-	}
+	} });
 }
 
 void FileBrowserActivity::RenameSave(int index)
 {
-	auto &file = files[index];
-	ByteString newName = TextPrompt::Blocking("Rename", "Change save name", file->GetDisplayName(), "", 0).ToUtf8();
-	if (newName.length())
-	{
-		newName = ByteString::Build(directory, PATH_SEP_CHAR, newName, ".cps");
-		if (!Platform::RenameFile(file->GetName(), newName, false))
-			ErrorMessage::Blocking("Error", "Could not rename file");
+	new TextPrompt("Rename", "Change save name", files[index]->GetDisplayName(), "", 0, { [this, index](const String &input) {
+		auto &file = files[index];
+		auto newName = input.ToUtf8();
+		if (newName.length())
+		{
+			newName = ByteString::Build(directory, PATH_SEP_CHAR, newName, ".cps");
+			if (!Platform::RenameFile(file->GetName(), newName, false))
+			{
+				new ErrorMessage("Error", "Could not rename file");
+			}
+			else
+			{
+				loadDirectory(directory, "");
+			}
+		}
 		else
-			loadDirectory(directory, "");
-	}
-	else
-		ErrorMessage::Blocking("Error", "No save name given");
+		{
+			new ErrorMessage("Error", "No save name given");
+		}
+	} });
 }
 
 void FileBrowserActivity::cleanup()
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index 7e27acd36..bf0fc09ae 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -604,10 +604,9 @@ void GameView::NotifyToolListChanged(GameModel * sender)
 					}
 					else if (identifier.BeginsWith("DEFAULT_PT_LIFECUST_"))
 					{
-						if (ConfirmPrompt::Blocking("Remove custom GOL type", "Are you sure you want to remove " + identifier.Substr(20).FromUtf8() + "?"))
-						{
+						new ConfirmPrompt("Remove custom GOL type", "Are you sure you want to remove " + identifier.Substr(20).FromUtf8() + "?", { [this, identifier]() {
 							c->RemoveCustomGOLType(identifier);
-						}
+						} });
 					}
 				}
 			}
@@ -994,17 +993,12 @@ int GameView::Record(bool record)
 	}
 	else if (!recording)
 	{
-		// block so that the return value is correct
-		bool record = ConfirmPrompt::Blocking("Recording", "You're about to start recording all drawn frames. This will use a load of disk space.");
-		if (record)
-		{
-			time_t startTime = time(NULL);
-			recordingFolder = startTime;
-			Platform::MakeDirectory("recordings");
-			Platform::MakeDirectory(ByteString::Build("recordings", PATH_SEP_CHAR, recordingFolder));
-			recording = true;
-			recordingIndex = 0;
-		}
+		time_t startTime = time(NULL);
+		recordingFolder = startTime;
+		Platform::MakeDirectory("recordings");
+		Platform::MakeDirectory(ByteString::Build("recordings", PATH_SEP_CHAR, recordingFolder));
+		recording = true;
+		recordingIndex = 0;
 	}
 	return recordingFolder;
 }
diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp
index e4b490451..721a5d26c 100644
--- a/src/gui/preview/PreviewView.cpp
+++ b/src/gui/preview/PreviewView.cpp
@@ -385,8 +385,9 @@ void PreviewView::OnTick(float dt)
 	c->Update();
 	if (doError)
 	{
-		ErrorMessage::Blocking("Error loading save", doErrorMessage);
-		c->Exit();
+		new ErrorMessage("Error loading save", doErrorMessage, { [this]() {
+			c->Exit();
+		} });
 	}
 
 	if (reportSaveRequest && reportSaveRequest->CheckDone())
diff --git a/src/gui/profile/ProfileActivity.cpp b/src/gui/profile/ProfileActivity.cpp
index fc472ae7f..379320bb4 100644
--- a/src/gui/profile/ProfileActivity.cpp
+++ b/src/gui/profile/ProfileActivity.cpp
@@ -196,8 +196,9 @@ void ProfileActivity::OnTick(float dt)
 {
 	if (doError)
 	{
-		ErrorMessage::Blocking("Error", doErrorMessage);
-		Exit();
+		new ErrorMessage("Error", doErrorMessage, { [this]() {
+			Exit();
+		} });
 	}
 
 	if (saveUserInfoRequest && saveUserInfoRequest->CheckDone())