From 47d3c506076a25f67fbbf6f5d248ababe9519c76 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Thu, 21 Feb 2008 10:10:17 +0000
Subject: [PATCH] Change the order we use to check the position of the mouse
 pointer inside menus: first sub, then current, then super. It's more logical,
 and handles every case (hopefully I've tested every possible combination) of
 overlapping menus correctly. Fixes bug #1821.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24044 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/Menu.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index cd1c8859a0..e05f7f036c 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1424,13 +1424,14 @@ BMenu::_Track(int *action, long start)
 			continue;
 		}
 	
+		// The order of the checks is important
+		// to be able to handle overlapping menus:
+		// first we check if mouse is inside a submenu,
+		// then if the menu is inside this menu,
+		// then if it's over a super menu. 
+		bool overSub = _OverSubmenu(fSelected, screenLocation);
 		item = _HitTestItems(location, B_ORIGIN);
-		if (item != NULL) {
-			_UpdateStateOpenSelect(item, openTime, mouseSpeed);
-			if (!releasedOnce)
-				releasedOnce = true;
-		
-		} else if (_OverSubmenu(fSelected, screenLocation)) {
+		if (overSub) {
 			// Since the submenu has its own looper,
 			// we can unlock ours. Doing so also make sure
 			// that our window gets any update message to
@@ -1450,11 +1451,15 @@ BMenu::_Track(int *action, long start)
 				fState = MENU_STATE_CLOSED;			
 			}
 			if (!LockLooper())
-				break;
+				break;			
+		} else if (item != NULL) {
+			_UpdateStateOpenSelect(item, openTime, mouseSpeed);
+			if (!releasedOnce)
+				releasedOnce = true;		
 		} else if (_OverSuper(screenLocation)) {
 			fState = MENU_STATE_TRACKING;			
 			UnlockLooper();
-			break;			
+			break;
 		} else {
 			// Mouse pointer outside menu:
 			// If there's no other submenu opened,
@@ -1489,12 +1494,6 @@ BMenu::_Track(int *action, long start)
 				UnlockLooper();		
 			}
 			
-#if 1
-			// TODO: on vmware, looks like the second system_time() could return
-			// a value smaller than the first call. Bug in VMWare or haiku ?
-			if (newPollTime <= pollTime)
-				newPollTime = pollTime + 5000;
-#endif
 			// mouseSpeed in px per ms
 			// (actually point_distance returns the square of the distance,
 			// so it's more px^2 per ms)
@@ -2040,7 +2039,7 @@ BMenu::_OverSubmenu(BMenuItem *item, BPoint loc)
 	if (subMenu == NULL || subMenu->Window() == NULL)
 		return false;
 
-	// we assume that loc is in screen coords
+	// we assume that loc is in screen coords {
 	if (subMenu->Window()->Frame().Contains(loc))
 		return true;