From de7218da8dfcac8d66280811ea755b75da474301 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 20 Sep 2012 22:28:32 -0400
Subject: Fix black border around dialogs being off (I think I got all of them)


diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp
index 493ddc3..1aa75e2 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 796e37b..ef86152 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 6cdd48e..b015b06 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 3566fb1..85472a0 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 67c276a..811d10e 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 00f54b6..4a5fc69 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);
 }
 
--
cgit v0.9.2-21-gd62e