From 8bf558a299096f385630b7ee148dd509005e983b Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Mon, 18 Jul 2011 17:03:55 +0200
Subject: COMPOSER: Try to fix contains() for kButtonEllipse.

---
 engines/composer/composer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 78819a92c5..74696e81b1 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -312,12 +312,12 @@ bool Button::contains(const Common::Point &pos) const {
 		if (!_rect.contains(pos))
 			return false;
 		{
-		int16 a = _rect.height() / 2;
-		int16 b = _rect.width() / 2;
+		int16 a = _rect.width() / 2;
+		int16 b = _rect.height() / 2;
 		if (!a || !b)
 			return false;
 		Common::Point adjustedPos = pos - Common::Point(_rect.left + a, _rect.top + b);
-		return ((adjustedPos.x*adjustedPos.x)/a*2 + (adjustedPos.y*adjustedPos.y)/b*2 < 1);
+		return ((adjustedPos.x*adjustedPos.x)/(a*a) + (adjustedPos.y*adjustedPos.y)/(b*b) < 1);
 		}
 	case kButtonSprites:
 		return false;
-- 
cgit v1.2.3