From 1094cc9dc94e48b218826b66332a22e9ca63591b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sun, 12 Feb 2023 09:28:55 +0100 Subject: [PATCH] Emscripten: Remove blocking prompt functions --- src/gui/dialogues/ConfirmPrompt.cpp | 11 ----------- src/gui/dialogues/ConfirmPrompt.h | 1 - src/gui/dialogues/ErrorMessage.cpp | 8 -------- src/gui/dialogues/ErrorMessage.h | 1 - src/gui/dialogues/TextPrompt.cpp | 14 -------------- src/gui/dialogues/TextPrompt.h | 1 - 6 files changed, 36 deletions(-) diff --git a/src/gui/dialogues/ConfirmPrompt.cpp b/src/gui/dialogues/ConfirmPrompt.cpp index 845b4e8b6..ba4e96b05 100644 --- a/src/gui/dialogues/ConfirmPrompt.cpp +++ b/src/gui/dialogues/ConfirmPrompt.cpp @@ -67,17 +67,6 @@ ConfirmPrompt::ConfirmPrompt(String title, String message, ResultCallback callba MakeActiveWindow(); } -bool ConfirmPrompt::Blocking(String title, String message, String buttonText) -{ - bool outputResult; - new ConfirmPrompt(title, message, { - [&outputResult] { outputResult = true; ui::Engine::Ref().Break(); }, - [&outputResult] { outputResult = false; ui::Engine::Ref().Break(); }, - }, buttonText); - EngineProcess(); - return outputResult; -} - void ConfirmPrompt::OnDraw() { Graphics * g = GetGraphics(); diff --git a/src/gui/dialogues/ConfirmPrompt.h b/src/gui/dialogues/ConfirmPrompt.h index 17a45ef5f..802d2589b 100644 --- a/src/gui/dialogues/ConfirmPrompt.h +++ b/src/gui/dialogues/ConfirmPrompt.h @@ -16,6 +16,5 @@ public: ConfirmPrompt(String title, String message, ResultCallback callback_ = {}, String buttonText = String("Confirm")); virtual ~ConfirmPrompt() = default; - static bool Blocking(String title, String message, String buttonText = String("Confirm")); void OnDraw() override; }; diff --git a/src/gui/dialogues/ErrorMessage.cpp b/src/gui/dialogues/ErrorMessage.cpp index 15a726d1b..df947d7e7 100644 --- a/src/gui/dialogues/ErrorMessage.cpp +++ b/src/gui/dialogues/ErrorMessage.cpp @@ -46,14 +46,6 @@ ErrorMessage::ErrorMessage(String title, String message, DismissCallback callbac MakeActiveWindow(); } -void ErrorMessage::Blocking(String title, String message) -{ - new ErrorMessage(title, message, { [] { - ui::Engine::Ref().Break(); - } }); - EngineProcess(); -} - void ErrorMessage::OnDraw() { Graphics * g = GetGraphics(); diff --git a/src/gui/dialogues/ErrorMessage.h b/src/gui/dialogues/ErrorMessage.h index fcec273ed..ef79fbed3 100644 --- a/src/gui/dialogues/ErrorMessage.h +++ b/src/gui/dialogues/ErrorMessage.h @@ -16,6 +16,5 @@ public: ErrorMessage(String title, String message, DismissCallback callback_ = {}); virtual ~ErrorMessage() = default; - static void Blocking(String title, String message); void OnDraw() override; }; diff --git a/src/gui/dialogues/TextPrompt.cpp b/src/gui/dialogues/TextPrompt.cpp index cd5b7a490..40454af55 100644 --- a/src/gui/dialogues/TextPrompt.cpp +++ b/src/gui/dialogues/TextPrompt.cpp @@ -6,7 +6,6 @@ #include "gui/interface/Textbox.h" #include "gui/Style.h" -#include "PowderToySDL.h" #include "graphics/Graphics.h" @@ -76,19 +75,6 @@ TextPrompt::TextPrompt(String title, String message, String text, String placeho MakeActiveWindow(); } -String TextPrompt::Blocking(String title, String message, String text, String placeholder, bool multiline) -{ - String outputString; - new TextPrompt(title, message, text, placeholder, multiline, { [&outputString](String const &resultText) { - outputString = resultText; - ui::Engine::Ref().Break(); - }, [](){ - ui::Engine::Ref().Break(); - }}); - EngineProcess(); - return outputString; -} - void TextPrompt::OnDraw() { Graphics * g = GetGraphics(); diff --git a/src/gui/dialogues/TextPrompt.h b/src/gui/dialogues/TextPrompt.h index 3fbeaf2de..51ea42e4e 100644 --- a/src/gui/dialogues/TextPrompt.h +++ b/src/gui/dialogues/TextPrompt.h @@ -25,6 +25,5 @@ public: TextPrompt(String title, String message, String text, String placeholder, bool multiline, TextDialogueCallback callback_ = {}); virtual ~TextPrompt() = default; - static String Blocking(String title, String message, String text, String placeholder, bool multiline); void OnDraw() override; };