Blocking Confirm/Error/Input prompts (EngineProcess creates a new event loop which can be broken out of with Engine::Break())

6 files changed, 148 insertions, 12 deletions

diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp
index 459e1c0..312d98c 100644
--- a/src/dialogues/ConfirmPrompt.cpp
+++ b/src/dialogues/ConfirmPrompt.cpp
@@ -9,6 +9,7 @@
 #include "Style.h"
 #include "interface/Label.h"
 #include "interface/Button.h"
+#include "PowderToy.h"
 
 ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDialogueCallback * callback_):
 	ui::Window(ui::Point(-1, -1), ui::Point(250, 50)),
@@ -40,7 +41,8 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
 		void ActionCallback(ui::Button * sender)
 		{
 			ui::Engine::Ref().CloseWindow();
-			prompt->callback->ConfirmCallback(result);
+			if(prompt->callback)
+				prompt->callback->ConfirmCallback(result);
 			prompt->SelfDestruct();
 		}
 	};
@@ -65,6 +67,83 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
 	ui::Engine::Ref().ShowWindow(this);
 }
 
+ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, std::string buttonText, ConfirmDialogueCallback * callback_):
+	ui::Window(ui::Point(-1, -1), ui::Point(250, 50)),
+	callback(callback_)
+{
+	int width, height;
+	ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), title);
+	titleLabel->SetTextColour(style::Colour::WarningTitle);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	AddComponent(titleLabel);
+
+
+	ui::Label * messageLabel = new ui::Label(ui::Point(4, 25), ui::Point(Size.X-8, -1), message);
+	messageLabel->SetMultiline(true);
+	messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
+	AddComponent(messageLabel);
+
+	Size.Y += messageLabel->Size.Y+12;
+	Position.Y = (ui::Engine::Ref().GetHeight()-Size.Y)/2;
+
+	class CloseAction: public ui::ButtonAction
+	{
+	public:
+		ConfirmPrompt * prompt;
+		DialogueResult result;
+		CloseAction(ConfirmPrompt * prompt_, DialogueResult result_) { prompt = prompt_; result = result_; }
+		void ActionCallback(ui::Button * sender)
+		{
+			ui::Engine::Ref().CloseWindow();
+			if(prompt->callback)
+				prompt->callback->ConfirmCallback(result);
+			prompt->SelfDestruct();
+		}
+	};
+
+
+	ui::Button * cancelButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X-75, 16), "Cancel");
+	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	cancelButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
+	cancelButton->SetActionCallback(new CloseAction(this, ResultCancel));
+	AddComponent(cancelButton);
+	SetCancelButton(cancelButton);
+
+	ui::Button * okayButton = new ui::Button(ui::Point(Size.X-76, Size.Y-16), ui::Point(76, 16), buttonText);
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	okayButton->Appearance.TextInactive = style::Colour::WarningTitle;
+	okayButton->SetActionCallback(new CloseAction(this, ResultOkay));
+	AddComponent(okayButton);
+	SetOkayButton(okayButton);
+
+	ui::Engine::Ref().ShowWindow(this);
+}
+
+bool ConfirmPrompt::Blocking(std::string title, std::string message, std::string buttonText)
+{
+	class BlockingPromptCallback: public ConfirmDialogueCallback {
+	public:
+		bool & outputResult;
+		BlockingPromptCallback(bool & output): outputResult(output) {}
+		virtual void ConfirmCallback(ConfirmPrompt::DialogueResult result) {
+			if (result == ConfirmPrompt::ResultOkay)
+				outputResult = true;
+			else
+				outputResult = false;
+			ui::Engine::Ref().Break();
+		}
+		virtual ~BlockingPromptCallback() { }
+	};
+	bool result;
+	new ConfirmPrompt(title, message, buttonText, new BlockingPromptCallback(result));
+	EngineProcess();
+	return result;
+}
+
 void ConfirmPrompt::OnDraw()
 {
 	Graphics * g = ui::Engine::Ref().g;
diff --git a/src/dialogues/ConfirmPrompt.h b/src/dialogues/ConfirmPrompt.h
index f86a386..b866338 100644
--- a/src/dialogues/ConfirmPrompt.h
+++ b/src/dialogues/ConfirmPrompt.h
@@ -14,7 +14,9 @@ class ConfirmDialogueCallback;
 class ConfirmPrompt: public ui::Window {
 public:
 	enum DialogueResult { ResultCancel, ResultOkay };
-	ConfirmPrompt(std::string title, std::string message, ConfirmDialogueCallback * callback_);
+	ConfirmPrompt(std::string title, std::string message, ConfirmDialogueCallback * callback_ = NULL);
+	ConfirmPrompt(std::string title, std::string message, std::string buttonText, ConfirmDialogueCallback * callback_ = NULL);
+	static bool Blocking(std::string title, std::string message, std::string buttonText = "Confirm");
 	virtual void OnDraw();
 	virtual ~ConfirmPrompt();
 	ConfirmDialogueCallback * callback;
diff --git a/src/dialogues/ErrorMessage.cpp b/src/dialogues/ErrorMessage.cpp
index 9bff8fb..083e541 100644
--- a/src/dialogues/ErrorMessage.cpp
+++ b/src/dialogues/ErrorMessage.cpp
@@ -9,9 +9,11 @@
 #include "ErrorMessage.h"
 #include "interface/Button.h"
 #include "interface/Label.h"
+#include "PowderToy.h"
 
-ErrorMessage::ErrorMessage(std::string title, std::string message):
-	ui::Window(ui::Point(-1, -1), ui::Point(200, 75))
+ErrorMessage::ErrorMessage(std::string title, std::string message,  ErrorMessageCallback * callback_):
+	ui::Window(ui::Point(-1, -1), ui::Point(200, 75)),
+	callback(callback_)
 {
 	ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 16), title);
 	titleLabel->SetTextColour(style::Colour::ErrorTitle);
@@ -32,7 +34,9 @@ ErrorMessage::ErrorMessage(std::string title, std::string message):
 		void ActionCallback(ui::Button * sender)
 		{
 			ui::Engine::Ref().CloseWindow();
-			message->SelfDestruct(); //TODO: Fix component disposal
+			if(message->callback)
+				message->callback->DismissCallback();
+			message->SelfDestruct();
 		}
 	};
 
@@ -48,6 +52,20 @@ ErrorMessage::ErrorMessage(std::string title, std::string message):
 	ui::Engine::Ref().ShowWindow(this);
 }
 
+void ErrorMessage::Blocking(std::string title, std::string message)
+{
+	class BlockingDismissCallback: public ErrorMessageCallback {
+	public:
+		BlockingDismissCallback() {}
+		virtual void DismissCallback() {
+			ui::Engine::Ref().Break();
+		}
+		virtual ~BlockingDismissCallback() { }
+	};
+	new ErrorMessage(title, message, new BlockingDismissCallback());
+	EngineProcess();
+}
+
 void ErrorMessage::OnDraw()
 {
 	Graphics * g = ui::Engine::Ref().g;
@@ -57,5 +75,7 @@ void ErrorMessage::OnDraw()
 }
 
 ErrorMessage::~ErrorMessage() {
+	if(callback)
+		delete callback;
 }
 
diff --git a/src/dialogues/ErrorMessage.h b/src/dialogues/ErrorMessage.h
index f8575bd..769127e 100644
--- a/src/dialogues/ErrorMessage.h
+++ b/src/dialogues/ErrorMessage.h
@@ -10,11 +10,21 @@
 
 #include "interface/Window.h"
 
+class ErrorMessageCallback;
 class ErrorMessage: public ui::Window {
+	ErrorMessageCallback * callback;
 public:
-	ErrorMessage(std::string title, std::string message);
+	ErrorMessage(std::string title, std::string message, ErrorMessageCallback * callback_ = NULL);
+	static void Blocking(std::string title, std::string message);
 	virtual void OnDraw();
 	virtual ~ErrorMessage();
 };
 
+class ErrorMessageCallback
+{
+	public:
+		virtual void DismissCallback() {}
+		virtual ~ErrorMessageCallback() {}
+};
+
 #endif /* ERRORMESSAGE_H_ */
diff --git a/src/dialogues/TextPrompt.cpp b/src/dialogues/TextPrompt.cpp
index d5b6c95..3a2a39f 100644
--- a/src/dialogues/TextPrompt.cpp
+++ b/src/dialogues/TextPrompt.cpp
@@ -9,6 +9,7 @@
 #include "interface/Label.h"
 #include "interface/Button.h"
 #include "Style.h"
+#include "PowderToy.h"
 
 class CloseAction: public ui::ButtonAction
 {
@@ -25,7 +26,7 @@ public:
 	}
 };
 
-TextPrompt::TextPrompt(std::string title, std::string message, bool multiline, TextDialogueCallback * callback_):
+TextPrompt::TextPrompt(std::string title, std::string message, std::string text, std::string placeholder, bool multiline, TextDialogueCallback * callback_):
 	ui::Window(ui::Point(-1, -1), ui::Point(200, 80)),
 	callback(callback_)
 {
@@ -39,7 +40,7 @@ TextPrompt::TextPrompt(std::string title, std::string message, bool multiline, T
 	messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
 	AddComponent(messageLabel);
 
-	textField = new ui::Textbox(ui::Point(4, 45 ), ui::Point(Size.X-8, 16), "", "Reason");
+	textField = new ui::Textbox(ui::Point(4, 45 ), ui::Point(Size.X-8, 16), text, placeholder);
 	if(multiline)
 	{
 		textField->SetMultiline(true);
@@ -73,6 +74,29 @@ TextPrompt::TextPrompt(std::string title, std::string message, bool multiline, T
 	ui::Engine::Ref().ShowWindow(this);
 }
 
+std::string TextPrompt::Blocking(std::string title, std::string message, std::string text, std::string placeholder, bool multiline)
+{
+	std::string returnString = "";
+
+	class BlockingTextCallback: public TextDialogueCallback {
+		std::string & outputString;
+	public:
+		BlockingTextCallback(std::string & output) : outputString(output) {}
+		virtual void TextCallback(TextPrompt::DialogueResult result, std::string resultText) {
+			if(result == ResultOkay)
+				outputString = resultText;
+			else
+				outputString = "";
+			ui::Engine::Ref().Break();
+		}
+		virtual ~BlockingTextCallback() { }
+	};
+	new TextPrompt(title, message, text, placeholder, multiline, new BlockingTextCallback(returnString));
+	EngineProcess();
+
+	return returnString;
+}
+
 void TextPrompt::OnDraw()
 {
 	Graphics * g = ui::Engine::Ref().g;
diff --git a/src/dialogues/TextPrompt.h b/src/dialogues/TextPrompt.h
index 8016d56..1c4a672 100644
--- a/src/dialogues/TextPrompt.h
+++ b/src/dialogues/TextPrompt.h
@@ -5,8 +5,8 @@
  *      Author: Simon
  */
 
-#ifndef CONFIRMPROMPT_H_
-#define CONFIRMPROMPT_H_
+#ifndef TEXTPROMPT_H_
+#define TEXTPROMPT_H_
 
 #include "interface/Window.h"
 #include "interface/Textbox.h"
@@ -18,7 +18,8 @@ protected:
 public:
 	friend class CloseAction;
 	enum DialogueResult { ResultCancel, ResultOkay };
-	TextPrompt(std::string title, std::string message, bool multiline, TextDialogueCallback * callback_);
+	TextPrompt(std::string title, std::string message, std::string text, std::string placeholder, bool multiline, TextDialogueCallback * callback_);
+	static std::string Blocking(std::string title, std::string message, std::string text, std::string placeholder, bool multiline);
 	virtual void OnDraw();
 	virtual ~TextPrompt();
 	TextDialogueCallback * callback;
@@ -31,4 +32,4 @@ class TextDialogueCallback
 		virtual ~TextDialogueCallback() {}
 };
 
-#endif /* CONFIRMPROMPT_H_ */
+#endif /* TEXTPROMPT_H_ */