summaryrefslogtreecommitdiff
path: root/src/dialogues/ErrorMessage.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-05 16:31:49 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-05 16:31:49 (GMT)
commitd61690bc091af0e253abe18832cc06f6c998724a (patch)
treebc152e2abb2790d03d9c24b9576954d307fbcafc /src/dialogues/ErrorMessage.cpp
parentd379390d066add46513da73a690ef20414b6627b (diff)
downloadpowder-d61690bc091af0e253abe18832cc06f6c998724a.zip
powder-d61690bc091af0e253abe18832cc06f6c998724a.tar.gz
Prevent setting double scale on smaller screens. Fixes #166
Diffstat (limited to 'src/dialogues/ErrorMessage.cpp')
-rw-r--r--src/dialogues/ErrorMessage.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dialogues/ErrorMessage.cpp b/src/dialogues/ErrorMessage.cpp
index 083e541..796e37b 100644
--- a/src/dialogues/ErrorMessage.cpp
+++ b/src/dialogues/ErrorMessage.cpp
@@ -12,7 +12,7 @@
#include "PowderToy.h"
ErrorMessage::ErrorMessage(std::string title, std::string message, ErrorMessageCallback * callback_):
- ui::Window(ui::Point(-1, -1), ui::Point(200, 75)),
+ ui::Window(ui::Point(-1, -1), ui::Point(200, 35)),
callback(callback_)
{
ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 16), title);
@@ -21,11 +21,15 @@ ErrorMessage::ErrorMessage(std::string title, std::string message, ErrorMessage
titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
AddComponent(titleLabel);
- ui::Label * messageLabel = new ui::Label(ui::Point(4, 24), ui::Point(Size.X-8, 60), message);
+ ui::Label * messageLabel = new ui::Label(ui::Point(4, 24), 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 DismissAction: public ui::ButtonAction
{
ErrorMessage * message;