Obviously I put in the usual 'untested last minute change' which broke everything. Should be fixed now.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17042 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
c51421cc0b
commit
bf5d7973b9
@ -1156,17 +1156,6 @@ BMenu::_track(int *action, long start)
|
||||
BPoint location;
|
||||
GetMouse(&location, &buttons, false);
|
||||
|
||||
if (localAction == MENU_ACT_CLOSE || (buttons != 0 && IsStickyMode())) {
|
||||
UnlockLooper();
|
||||
break;
|
||||
} else if (buttons == 0) {
|
||||
if (IsStickyPrefOn())
|
||||
SetStickyMode(true);
|
||||
else {
|
||||
UnlockLooper();
|
||||
break;
|
||||
}
|
||||
}
|
||||
BPoint screenLocation = ConvertToScreen(location);
|
||||
item = HitTestItems(location, B_ORIGIN);
|
||||
if (item != NULL) {
|
||||
@ -1209,6 +1198,15 @@ BMenu::_track(int *action, long start)
|
||||
UnlockLooper();
|
||||
|
||||
snooze(snoozeAmount);
|
||||
|
||||
if (localAction == MENU_ACT_CLOSE || (buttons != 0 && IsStickyMode()))
|
||||
break;
|
||||
else if (buttons == 0) {
|
||||
if (IsStickyPrefOn())
|
||||
SetStickyMode(true);
|
||||
else
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (localAction == MENU_ACT_NONE && okay) {
|
||||
|
Loading…
Reference in New Issue
Block a user