Move style into Component

3 files changed, 24 insertions, 17 deletions

diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp
index e3c8e3a..a5f742d 100644
--- a/src/dialogues/ConfirmPrompt.cpp
+++ b/src/dialogues/ConfirmPrompt.cpp
@@ -15,11 +15,13 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
 {
 	ui::Label * titleLabel = new ui::Label(ui::Point(2, 1), ui::Point(Size.X-4, 16), title);
 	titleLabel->SetTextColour(ui::Colour(220, 220, 50));
-	titleLabel->SetAlignment(AlignLeft, AlignBottom);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
 	AddComponent(titleLabel);
 
 	ui::Label * messageLabel = new ui::Label(ui::Point(4, 18), ui::Point(Size.X-8, 60), message);
-	messageLabel->SetAlignment(AlignLeft, AlignTop);
+	messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
 	AddComponent(messageLabel);
 
 	class CloseAction: public ui::ButtonAction
@@ -38,14 +40,16 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
 
 
 	ui::Button * cancelButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X-50, 16), "Cancel");
-	cancelButton->SetAlignment(AlignLeft, AlignBottom);
-	cancelButton->SetBorderColour(ui::Colour(200, 200, 200));
+	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	cancelButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	cancelButton->SetActionCallback(new CloseAction(this, ResultCancel));
 	AddComponent(cancelButton);
 
 	ui::Button * okayButton = new ui::Button(ui::Point(Size.X-50, Size.Y-16), ui::Point(50, 16), "Continue");
-	okayButton->SetAlignment(AlignLeft, AlignBottom);
-	okayButton->SetTextColour(ui::Colour(220, 220, 50));
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	okayButton->Appearance.TextInactive = ui::Colour(220, 220, 50);
 	okayButton->SetActionCallback(new CloseAction(this, ResultOkay));
 	AddComponent(okayButton);
 
diff --git a/src/dialogues/ErrorMessage.cpp b/src/dialogues/ErrorMessage.cpp
index 3b9fc18..5114fc7 100644
--- a/src/dialogues/ErrorMessage.cpp
+++ b/src/dialogues/ErrorMessage.cpp
@@ -14,11 +14,13 @@ ErrorMessage::ErrorMessage(std::string title, std::string message):
 {
 	ui::Label * titleLabel = new ui::Label(ui::Point(2, 1), ui::Point(Size.X-4, 16), title);
 	titleLabel->SetTextColour(ui::Colour(200, 100, 50));
-	titleLabel->SetAlignment(AlignLeft, AlignBottom);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
 	AddComponent(titleLabel);
 
 	ui::Label * messageLabel = new ui::Label(ui::Point(4, 18), ui::Point(Size.X-8, 60), message);
-	messageLabel->SetAlignment(AlignLeft, AlignTop);
+	messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
 	AddComponent(messageLabel);
 
 	class DismissAction: public ui::ButtonAction
@@ -34,8 +36,9 @@ ErrorMessage::ErrorMessage(std::string title, std::string message):
 	};
 
 	ui::Button * okayButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X, 16), "Dismiss");
-	okayButton->SetAlignment(AlignRight, AlignBottom);
-	okayButton->SetBorderColour(ui::Colour(200, 200, 200));
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignRight;
+	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	okayButton->SetActionCallback(new DismissAction(this));
 	AddComponent(okayButton);
 	ui::Engine::Ref().ShowWindow(this);
diff --git a/src/dialogues/TextPrompt.cpp b/src/dialogues/TextPrompt.cpp
index 1f84e63..2625f24 100644
--- a/src/dialogues/TextPrompt.cpp
+++ b/src/dialogues/TextPrompt.cpp
@@ -30,27 +30,27 @@ TextPrompt::TextPrompt(std::string title, std::string message, bool multiline, T
 {
 	ui::Label * titleLabel = new ui::Label(ui::Point(2, 1), ui::Point(Size.X-4, 16), title);
 	titleLabel->SetTextColour(ui::Colour(220, 220, 50));
-	titleLabel->SetAlignment(AlignLeft, AlignBottom);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
 	AddComponent(titleLabel);
 
 	ui::Label * messageLabel = new ui::Label(ui::Point(4, 18), ui::Point(Size.X-8, 60), message);
-	messageLabel->SetAlignment(AlignLeft, AlignTop);
+	messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop;
 	AddComponent(messageLabel);
 
 	ui::Button * cancelButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X-50, 16), "Cancel");
-	cancelButton->SetAlignment(AlignLeft, AlignBottom);
-	cancelButton->SetBorderColour(ui::Colour(200, 200, 200));
+	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	cancelButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
 	cancelButton->SetActionCallback(new CloseAction(this, ResultCancel));
 	AddComponent(cancelButton);
 
 	ui::Button * okayButton = new ui::Button(ui::Point(Size.X-50, Size.Y-16), ui::Point(50, 16), "Okay");
-	okayButton->SetAlignment(AlignLeft, AlignBottom);
-	okayButton->SetTextColour(ui::Colour(220, 220, 50));
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
+	okayButton->Appearance.TextInactive = ui::Colour(220, 220, 50);
 	okayButton->SetActionCallback(new CloseAction(this, ResultOkay));
 	AddComponent(okayButton);
 
 	textField = new ui::Textbox(ui::Point(4, 32), ui::Point(Size.X-8, 16), "");
-	textField->SetAlignment(AlignLeft, AlignBottom);
+	textField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;	textField->Appearance.VerticalAlign = ui::Appearance::AlignBottom;
 	AddComponent(textField);
 
 	ui::Engine::Ref().ShowWindow(this);