i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Obviously I put in the usual 'untested last minute change' which broke everything. Should be fixed now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17042 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-04-07 17:24:14 +00:00
parent c51421cc0b
commit bf5d7973b9
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+9 -11
View File
@@ -1156,17 +1156,6 @@ BMenu::_track(int *action, long start)
BPoint location; BPoint location;
GetMouse(&location, &buttons, false); 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); BPoint screenLocation = ConvertToScreen(location);
item = HitTestItems(location, B_ORIGIN); item = HitTestItems(location, B_ORIGIN);
if (item != NULL) { if (item != NULL) {
@@ -1209,6 +1198,15 @@ BMenu::_track(int *action, long start)
UnlockLooper(); UnlockLooper();
snooze(snoozeAmount); 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) { if (localAction == MENU_ACT_NONE && okay) {