summaryrefslogtreecommitdiffstats
path: root/generic/tkMenuDraw.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:39:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-02 11:39:29 (GMT)
commitbfeee5bf082e7cac82ff8616fe11502e97f2ed3c (patch)
treec12fa65a444645b8f89feba3bddeef8e4b31542b /generic/tkMenuDraw.c
parente9f82758411ef773b62638334f16b794cf990f5b (diff)
parent16d1be046a47a326a015e8bf3086ecd36c0b6e6d (diff)
downloadtk-bfeee5bf082e7cac82ff8616fe11502e97f2ed3c.zip
tk-bfeee5bf082e7cac82ff8616fe11502e97f2ed3c.tar.gz
tk-bfeee5bf082e7cac82ff8616fe11502e97f2ed3c.tar.bz2
[Bug 533519]: Window placement with multiple screens
Diffstat (limited to 'generic/tkMenuDraw.c')
-rw-r--r--generic/tkMenuDraw.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c
index d2a66d3..65aa591 100644
--- a/generic/tkMenuDraw.c
+++ b/generic/tkMenuDraw.c
@@ -844,7 +844,7 @@ TkPostTearoffMenu(
* posting */
{
int vRootX, vRootY, vRootWidth, vRootHeight;
- int tmp, result;
+ int result;
TkActivateMenuEntry(menuPtr, -1);
TkRecomputeMenu(menuPtr);
@@ -877,31 +877,21 @@ TkPostTearoffMenu(
* 2. The menu may not have been mapped yet, so its current size might be
* the default 1x1. To compute how much space it needs, use its
* requested size, not its actual size.
- *
- * Note that this code assumes square screen regions and all positive
- * coordinates. This does not work on a Mac with multiple monitors. But
- * then again, Tk has other problems with this.
*/
Tk_GetVRootGeometry(Tk_Parent(menuPtr->tkwin), &vRootX, &vRootY,
&vRootWidth, &vRootHeight);
- x += vRootX;
- y += vRootY;
- tmp = WidthOfScreen(Tk_Screen(menuPtr->tkwin))
- - Tk_ReqWidth(menuPtr->tkwin);
- if (x > tmp) {
- x = tmp;
+ if (x > vRootX + vRootWidth) {
+ x = vRootX + vRootWidth;
}
- if (x < 0) {
- x = 0;
+ if (x < vRootX) {
+ x = vRootX;
}
- tmp = HeightOfScreen(Tk_Screen(menuPtr->tkwin))
- - Tk_ReqHeight(menuPtr->tkwin);
- if (y > tmp) {
- y = tmp;
+ if (y > vRootY + vRootHeight) {
+ y = vRootY + vRootHeight;
}
- if (y < 0) {
- y = 0;
+ if (y < vRootY) {
+ y = vRootY;
}
Tk_MoveToplevelWindow(menuPtr->tkwin, x, y);
if (!Tk_IsMapped(menuPtr->tkwin)) {