[Bug 3562426]: Context menu goes out of edge of screen.

<p>PLEASE DON'T PUT THIS ASIDE TO A <b>MISTAKE</b> BRANCH OR SOMETHING!
It's simply a fork, in fossil there's nothing wrong with that!</p>

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 52d9739..89865de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-28  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tkMenuDraw.c: [Bug 3562426]: Context menu goes out of edge of
+	screen.
+
 2012-08-17  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/nmakehlp.c: Add "-V<num>" option, in order to be able
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c
index 7c69548..d4634cd 100644
--- a/generic/tkMenuDraw.c
+++ b/generic/tkMenuDraw.c
@@ -896,12 +896,14 @@ TkPostTearoffMenu(interp, menuPtr, x, y)
 
     Tk_GetVRootGeometry(Tk_Parent(menuPtr->tkwin), &vRootX, &vRootY,
 	&vRootWidth, &vRootHeight);
+    vRootWidth -= Tk_ReqWidth(menuPtr->tkwin);
     if (x > vRootX + vRootWidth) {
 	x = vRootX + vRootWidth;
     }
     if (x < vRootX) {
 	x = vRootX;
     }
+    vRootHeight -= Tk_ReqHeight(menuPtr->tkwin);
     if (y > vRootY + vRootHeight) {
 	y = vRootY + vRootHeight;
     }