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

Since Waldemar changes to menus, replicants menus didn't work

Browse Source 
anymore. That problem showed up for example during my haiku 
presentation at Begeistert, where I couldn't delete replicants from 
the desktop... grrrr!!! :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19708 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2007-01-05 10:03:33 +00:00
parent d5ff520ac3
commit 27e7210df2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1064,11 +1064,8 @@ BMenu::Track(bool sticky, BRect *clickToOpenRect)
UnlockLooper();
}
// If sticky is false, pass 0 to the tracking function
// so the menu will stay in nonsticky mode
const bigtime_t trackTime = sticky ? system_time() : 0;
int action;
BMenuItem *menuItem = _track(&action, trackTime);
BMenuItem *menuItem = _track(&action, 0);
SetStickyMode(false);
fExtraRect = NULL;
@ -1398,14 +1395,11 @@ BMenu::_UpdateStateClose(BMenuItem *item, const BPoint &where, const uint32 &but
SetStickyMode(false);
}
} else if (buttons == 0 && !IsStickyMode()) {
/* TODO: FIXME! trackTime is a hacky workaround for BMenuField. It
opens directly under your mouse pointer, so when you release the mouse
button the menu closes again because it started in non-sticky mode. */
/* if (system_time() < trackTime + 1000000
|| (fExtraRect != NULL && fExtraRect->Contains(location))) */
if (fExtraRect != NULL && fExtraRect->Contains(where))
if (fExtraRect != NULL && fExtraRect->Contains(where)) {
SetStickyMode(true);
else
fExtraRect = NULL;
// This code should be executed only once
} else
fState = MENU_STATE_CLOSED;
}
}