Applied QOALs patch to fix popup bug

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 37b01b3d..f0c5d0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-16  David Athay  <ko2fan@gmail.com>
+
+	*  src/gui/popupmenu.cpp: Applied QOAL's patch to fix popups at 
+	bottom of the screen.
+
 2008-05-15  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/widgets/tabbedarea.h, src/gui/widgets/tab.cpp,
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 1098cd3a..01f48ccc 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -246,9 +246,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();