diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-28 14:14:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-28 14:14:32 (GMT) |
| commit | 4445ffae4e0df3b8573e785c2d100e0ac0f113f2 (patch) | |
| tree | 30764989c7760f3022a4055dc3ca5c281b73466f | |
| parent | 8bf503fe4f3d712731a36512bd82a64a0eae94a2 (diff) | |
| parent | 19bd79ea770280000eb2d1c3c6826082d8ae9e39 (diff) | |
| download | tk-4445ffae4e0df3b8573e785c2d100e0ac0f113f2.zip tk-4445ffae4e0df3b8573e785c2d100e0ac0f113f2.tar.gz tk-4445ffae4e0df3b8573e785c2d100e0ac0f113f2.tar.bz2 | |
[Bug 3562426]: Context menu goes out of edge of screen.
FossilOrigin-Name: d703ff1315a181ed942e480454c9f82997e5b2e0
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkMenuDraw.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -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-27 Donal K. Fellows <dkf@users.sf.net> * (very many files): Reworked the generation of error messages and diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index 4cd9b02..1abe1c4 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.c @@ -881,12 +881,14 @@ TkPostTearoffMenu( 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; } |