summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorandreask <andreask>2012-08-28 20:40:46 (GMT)
committerandreask <andreask>2012-08-28 20:40:46 (GMT)
commit505bc4fa69263f911d5731495c4aebba6635d001 (patch)
treed51ef8f2c974548f306d56d88fcd90530f8ec001 /generic
parent8d82d25e214240383f8f7dfc778b7a7ad61fdce2 (diff)
parentdef65d20257d770205fdcfb53f1f2819487f923c (diff)
downloadtk-505bc4fa69263f911d5731495c4aebba6635d001.zip
tk-505bc4fa69263f911d5731495c4aebba6635d001.tar.gz
tk-505bc4fa69263f911d5731495c4aebba6635d001.tar.bz2
Merged inadvertent split back into one.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMenuDraw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c
index 65aa591..c49f513 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;
}