From de7218da8dfcac8d66280811ea755b75da474301 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Thu, 20 Sep 2012 22:28:32 -0400 Subject: [PATCH] Fix black border around dialogs being off (I think I got all of them) --- src/dialogues/ConfirmPrompt.cpp | 2 +- src/dialogues/ErrorMessage.cpp | 2 +- src/dialogues/InformationMessage.cpp | 2 +- src/dialogues/TextPrompt.cpp | 2 +- src/game/PropertyTool.cpp | 4 ++-- src/game/SignTool.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp index 493ddc324..1aa75e2ed 100644 --- a/src/dialogues/ConfirmPrompt.cpp +++ b/src/dialogues/ConfirmPrompt.cpp @@ -148,7 +148,7 @@ void ConfirmPrompt::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); } diff --git a/src/dialogues/ErrorMessage.cpp b/src/dialogues/ErrorMessage.cpp index 796e37b26..ef8615224 100644 --- a/src/dialogues/ErrorMessage.cpp +++ b/src/dialogues/ErrorMessage.cpp @@ -74,7 +74,7 @@ void ErrorMessage::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); } diff --git a/src/dialogues/InformationMessage.cpp b/src/dialogues/InformationMessage.cpp index 6cdd48e62..b015b0665 100644 --- a/src/dialogues/InformationMessage.cpp +++ b/src/dialogues/InformationMessage.cpp @@ -52,7 +52,7 @@ void InformationMessage::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); } diff --git a/src/dialogues/TextPrompt.cpp b/src/dialogues/TextPrompt.cpp index 3566fb1f3..85472a0da 100644 --- a/src/dialogues/TextPrompt.cpp +++ b/src/dialogues/TextPrompt.cpp @@ -109,7 +109,7 @@ void TextPrompt::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); } diff --git a/src/game/PropertyTool.cpp b/src/game/PropertyTool.cpp index 67c276a33..811d10e9f 100644 --- a/src/game/PropertyTool.cpp +++ b/src/game/PropertyTool.cpp @@ -54,7 +54,7 @@ position(position_) messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop; AddComponent(messageLabel); - ui::Button * okayButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X, 17), "OK"); + ui::Button * okayButton = new ui::Button(ui::Point(0, Size.Y-17), ui::Point(Size.X, 17), "OK"); okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; okayButton->Appearance.BorderInactive = ui::Colour(200, 200, 200); @@ -203,7 +203,7 @@ void PropertyWindow::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); } diff --git a/src/game/SignTool.cpp b/src/game/SignTool.cpp index 00f54b63c..4a5fc6918 100644 --- a/src/game/SignTool.cpp +++ b/src/game/SignTool.cpp @@ -253,7 +253,7 @@ void SignWindow::OnDraw() { Graphics * g = ui::Engine::Ref().g; - g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); + g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); }