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

small cleanups

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19591 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-12-21 14:35:13 +00:00
parent 59f9192c3b
commit f0f8601b3f
2 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuBar.cpp
+25 -26
View File
@@ -418,10 +418,12 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
if (startIndex != -1) {
be_app->ObscureCursor();
window->Lock();
_SelectItem(ItemAt(startIndex), true, true);
window->Unlock();
if (window->Lock()) {
_SelectItem(ItemAt(startIndex), true, true);
window->Unlock();
}
}
while (true) {
bigtime_t snoozeAmount = 40000;
bool locked = window->Lock();//WithTimeout(200000)
@@ -432,7 +434,6 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
ulong buttons;
GetMouse(&where, &buttons, true);
window->UpdateIfNeeded();
BMenuItem *menuItem = HitTestItems(where, B_ORIGIN);
if (menuItem != NULL) {
// Select item if:
@@ -461,31 +462,29 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
}
}
if (fSelected != NULL && OverSubmenu(fSelected, ConvertToScreen(where))) {
if (OverSubmenu(fSelected, ConvertToScreen(where))) {
// call _track() from the selected sub-menu when the mouse cursor
// is over its window
BMenu *menu = fSelected->Submenu();
if (menu != NULL) {
window->Unlock();
locked = false;
snoozeAmount = 30000;
bool wasSticky = IsStickyMode();
if (wasSticky)
menu->SetStickyMode(true);
int localAction;
fChosenItem = menu->_track(&localAction, system_time());
// check if the user started holding down a mouse button in a submenu
if (wasSticky && !IsStickyMode())
buttons = 1;
// buttons must have been pressed in the meantime
//menu->Window()->Activate();
if (localAction == MENU_STATE_CLOSED)
fState = MENU_STATE_CLOSED;
}
} else if (menuItem == NULL && !IsStickyMode()
&& fState != MENU_STATE_TRACKING_SUBMENU) {
window->Unlock();
locked = false;
snoozeAmount = 30000;
bool wasSticky = IsStickyMode();
if (wasSticky)
menu->SetStickyMode(true);
int localAction;
fChosenItem = menu->_track(&localAction, system_time());
// check if the user started holding down a mouse button in a submenu
if (wasSticky && !IsStickyMode())
buttons = 1;
// buttons must have been pressed in the meantime
if (localAction == MENU_STATE_CLOSED)
fState = MENU_STATE_CLOSED;
} else if (menuItem == NULL && fSelected != NULL
&& !IsStickyMode() && fState != MENU_STATE_TRACKING_SUBMENU) {
_SelectItem(NULL);
fState = MENU_STATE_TRACKING;
}