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

Some changes in menu tracking:

Browse Source 
- in the code path, now it's clear if the looper is locked or not
- if menus are quitting, now we don't call snooze() anymore, and avoid 
the extra GetMouse() call.
- some other cleanups


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23279 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-01-07 15:46:28 +00:00
parent 7957219ebb
commit 14e826c4ba
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1374,32 +1374,34 @@ BMenu::_Track(int *action, long start)
}
bool releasedOnce = buttons == 0;
while (true) {
while (fState != MENU_STATE_CLOSED) {
if (_CustomTrackingWantsToQuit())
break;
bool locked = LockLooper();
if (!locked)
if (!LockLooper())
break;
BMenuWindow *window = static_cast<BMenuWindow *>(Window());
BPoint screenLocation = ConvertToScreen(location);
if (window->CheckForScrolling(screenLocation)) {
item = NULL;
} else {
item = _HitTestItems(location, B_ORIGIN);
if (item != NULL) {
_UpdateStateOpenSelect(item, openTime, closeTime);
if (!releasedOnce)
releasedOnce = true;
}
UnlockLooper();
continue;
}
item = _HitTestItems(location, B_ORIGIN);
if (item != NULL) {
_UpdateStateOpenSelect(item, openTime, closeTime);
if (!releasedOnce)
releasedOnce = true;
}
// Track the submenu
if (_OverSubmenu(fSelected, screenLocation)) {
// Since the submenu has its own looper,
// we can unlock ours. Doing so also make sure
// that our window gets any update message to
// redraw itself
UnlockLooper();
locked = false;
int submenuAction = MENU_STATE_TRACKING;
BMenu *submenu = fSelected->Submenu();
submenu->_SetStickyMode(_IsStickyMode());
@ -1408,6 +1410,8 @@ BMenu::_Track(int *action, long start)
item = submenuItem;
fState = MENU_STATE_CLOSED;
}
if (!LockLooper())
break;
} else if (item == NULL) {
if (_OverSuper(screenLocation)) {
fState = MENU_STATE_TRACKING;
@ -1423,39 +1427,35 @@ BMenu::_Track(int *action, long start)
if (fSuper != NULL) {
// Give supermenu the chance to continue tracking
*action = fState;
if (locked)
UnlockLooper();
UnlockLooper();
return NULL;
}
}
}
if (!locked)
locked = LockLooper();
BPoint newLocation;
uint32 newButtons;
if (locked) {
GetMouse(&newLocation, &newButtons, true);
UnlockLooper();
locked = false;
}
UnlockLooper();
if (newLocation != location || newButtons != buttons) {
if (!releasedOnce && newButtons == 0 && buttons != 0)
releasedOnce = true;
location = newLocation;
buttons = newButtons;
}
if (releasedOnce)
_UpdateStateClose(item, location, buttons);
if (fState == MENU_STATE_CLOSED)
break;
if (fState != MENU_STATE_CLOSED) {
bigtime_t snoozeAmount = 50000;
snooze(snoozeAmount);
bigtime_t snoozeAmount = 50000;
snooze(snoozeAmount);
BPoint newLocation;
uint32 newButtons;
if (LockLooper()) {
GetMouse(&newLocation, &newButtons, true);
UnlockLooper();
}
if (newLocation != location || newButtons != buttons) {
if (!releasedOnce && newButtons == 0 && buttons != 0)
releasedOnce = true;
location = newLocation;
buttons = newButtons;
}
if (releasedOnce)
_UpdateStateClose(item, location, buttons);
}
}
if (action != NULL)