Merge 8.7

1 files changed, 13 insertions, 8 deletions

diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 886c14e..5c31ca0 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -882,13 +882,6 @@ TkpPostTearoffMenu(
     int result;
     (void)dummy;
 
-    if (index >= (int)menuPtr->numEntries) {
-	index = menuPtr->numEntries - 1;
-    }
-    if (index >= 0) {
-	y -= menuPtr->entries[index]->y;
-    }
-
     TkActivateMenuEntry(menuPtr, -1);
     TkRecomputeMenu(menuPtr);
     result = TkPostCommand(menuPtr);
@@ -905,7 +898,19 @@ TkpPostTearoffMenu(
     	return TCL_OK;
     }
 
-    /*
+     /*
+     * Adjust the menu y position so that the specified entry will be located
+     * at the given coordinates.
+     */
+
+    if (index >= (int)menuPtr->numEntries) {
+	index = menuPtr->numEntries - 1;
+    }
+    if (index >= 0) {
+	y -= menuPtr->entries[index]->y;
+    }
+
+   /*
      * Adjust the position of the menu if necessary to keep it visible on the
      * screen. There are two special tricks to make this work right:
      *