Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't quit tracking the menu even if OverSuper() returns true, if HitTestItems() doesn't return NULL. This should fix (at least in part) bug #85

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15891 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-01-10 09:40:28 +00:00
parent 6c678c57c7
commit b120bcd665
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/kits/interface/Menu.cpp
View File

@ -1070,29 +1070,30 @@ BMenu::_hide()
BMenuItem *
BMenu::_track(int *action, long start)
{
// TODO: Take Sticky mode into account
BPoint location;
// TODO: Take Sticky mode into account, cleanup
ulong buttons;
BMenuItem *item = NULL;
int localAction = MENU_ACT_NONE;
do {
if (!LockLooper())
break;
BPoint location;
GetMouse(&location, &buttons);
if (OverSuper(location)) {
UnlockLooper();
break;
}
item = HitTestItems(location, B_ORIGIN);
if (item != NULL) {
if (item != fSelected)
SelectItem(item);
} else if (fSelected != NULL && !OverSubmenu(fSelected, ConvertToScreen(location)))
} else {
if (OverSuper(location)) {
UnlockLooper();
break;
}
if (fSelected != NULL && !OverSubmenu(fSelected, ConvertToScreen(location)))
SelectItem(NULL);
}
if (fSelected != NULL && fSelected->Submenu() != NULL) {
UnlockLooper();