Applied QOAL's patch to fix popup bug.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5fdb0fc8..8a1768b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-16  David Athay  <ko2fan@gmail.com>
+
+	* src/gui/popupmenu.cpp: Applied QOAL's patch to fix popup bug.
+
 2008-05-14  fate  <fate.tmw@googlemail.com>
 
 	* src/configuration.cpp, src/game.cpp, src/player_relations.h,
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index f9bfe56d..cdc998e0 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -293,9 +293,9 @@ void PopupMenu::showPopup(int x, int y)
 {
     setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
     if (windowContainer->getWidth() < (x + getWidth() + 5))
-        x -= (getWidth() + 50);
+        x = windowContainer->getWidth() - getWidth();
     if (windowContainer->getHeight() < (y + getHeight() + 5))
-        y -= (getHeight() + 50);
+        y = windowContainer->getHeight() - getHeight();
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();