[[ Bug 13539 ]] menuPick not triggered under certain conditions

livecodesebastien · livecodesebastien · commit 322b51614d78 · 2014-10-02T11:37:05.000+01:00
diff --git a/docs/notes/bugfix-13539.md b/docs/notes/bugfix-13539.md
@@ -0,0 +1 @@
+#  menuPick not triggered under certain conditions
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -1290,7 +1290,9 @@ Boolean MCButton::mup(uint2 which, bool p_release)
 			        && MCeventtime - clicktime < OPTION_TIME)
 				return True;
 			else
-				if (menumode == WM_PULLDOWN && MCU_point_in_rect(rect, mx, my))
+                // SN-2014-10-02: [[ Bug 13539 ]] Only consider the mouse location if we are
+                //   sure that the coordinates are related to the stack, not the pulldown menu
+				if (menumode == WM_PULLDOWN && MCmousestackptr == getstack() && MCU_point_in_rect(rect, mx, my))
 				{
 					if (state & CS_MOUSE_UP_MENU)
 					{

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# menuPick not triggered under certain conditions`
Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,9 @@ Boolean MCButton::mup(uint2 which, bool p_release)`
`1290`	`1290`	`&& MCeventtime - clicktime < OPTION_TIME)`
`1291`	`1291`	`return True;`
`1292`	`1292`	`else`
`1293`		`- if (menumode == WM_PULLDOWN && MCU_point_in_rect(rect, mx, my))`
	`1293`	`+ // SN-2014-10-02: [[ Bug 13539 ]] Only consider the mouse location if we are`
	`1294`	`+ // sure that the coordinates are related to the stack, not the pulldown menu`
	`1295`	`+ if (menumode == WM_PULLDOWN && MCmousestackptr == getstack() && MCU_point_in_rect(rect, mx, my))`
`1294`	`1296`	`{`
`1295`	`1297`	`if (state & CS_MOUSE_UP_MENU)`
`1296`	`1298`	`{`