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

* automatic whitespace cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27644 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich 2008-09-20 10:17:00 +00:00
parent 37b9874302
commit d1fe803469
1 changed files with 35 additions and 35 deletions

70
src/kits/interface/Menu.cpp

@ -860,7 +860,7 @@ BMenu::KeyDown(const char *bytes, int32 numBytes)
// if we have no submenu and we're an // if we have no submenu and we're an
// item in the top menu below the menubar, // item in the top menu below the menubar,
// pass the keypress to the menubar // pass the keypress to the menubar
// so you can use the keypress to switch menus. // so you can use the keypress to switch menus.
BMessenger msgr(Supermenu()); BMessenger msgr(Supermenu());
msgr.SendMessage(Window()->CurrentMessage()); msgr.SendMessage(Window()->CurrentMessage());
} }
@ -871,7 +871,7 @@ BMenu::KeyDown(const char *bytes, int32 numBytes)
case B_SPACE: case B_SPACE:
if (fSelected) { if (fSelected) {
_InvokeItem(fSelected); _InvokeItem(fSelected);
_QuitTracking(false); _QuitTracking(false);
} }
break; break;
@ -1263,7 +1263,7 @@ BMenu::_InitData(BMessage* archive)
fLayoutData = new LayoutData; fLayoutData = new LayoutData;
fLayoutData->lastResizingMode = ResizingMode(); fLayoutData->lastResizingMode = ResizingMode();
SetLowColor(sMenuInfo.background_color); SetLowColor(sMenuInfo.background_color);
SetViewColor(sMenuInfo.background_color); SetViewColor(sMenuInfo.background_color);
@ -1285,7 +1285,7 @@ BMenu::_InitData(BMessage* archive)
archive->FindFloat("_maxwidth", &fMaxContentWidth); archive->FindFloat("_maxwidth", &fMaxContentWidth);
BMessage msg; BMessage msg;
for (int32 i = 0; archive->FindMessage("_items", i, &msg) == B_OK; i++) { for (int32 i = 0; archive->FindMessage("_items", i, &msg) == B_OK; i++) {
BArchivable *object = instantiate_object(&msg); BArchivable *object = instantiate_object(&msg);
if (BMenuItem *item = dynamic_cast<BMenuItem *>(object)) { if (BMenuItem *item = dynamic_cast<BMenuItem *>(object)) {
BRect bounds; BRect bounds;
@ -1389,7 +1389,7 @@ BMenu::_Hide()
const static bigtime_t kOpenSubmenuDelay = 225000; const static bigtime_t kOpenSubmenuDelay = 225000;
const static bigtime_t kNavigationAreaTimeout = 1000000; const static bigtime_t kNavigationAreaTimeout = 1000000;
const static bigtime_t kHysteresis = 200000; // TODO: Test and reduce if needed. const static bigtime_t kHysteresis = 200000; // TODO: Test and reduce if needed.
const static int32 kMouseMotionThreshold = 15; const static int32 kMouseMotionThreshold = 15;
// TODO: Same as above. Actually, we could get rid of the kHysteresis // TODO: Same as above. Actually, we could get rid of the kHysteresis
@ -1422,19 +1422,19 @@ BMenu::_Track(int *action, long start)
if (!LockLooper()) if (!LockLooper())
break; break;
BMenuWindow *window = static_cast<BMenuWindow *>(Window()); BMenuWindow *window = static_cast<BMenuWindow *>(Window());
BPoint screenLocation = ConvertToScreen(location); BPoint screenLocation = ConvertToScreen(location);
if (window->CheckForScrolling(screenLocation)) { if (window->CheckForScrolling(screenLocation)) {
UnlockLooper(); UnlockLooper();
continue; continue;
} }
// The order of the checks is important // The order of the checks is important
// to be able to handle overlapping menus: // to be able to handle overlapping menus:
// first we check if mouse is inside a submenu, // first we check if mouse is inside a submenu,
// then if the menu is inside this menu, // then if the menu is inside this menu,
// then if it's over a super menu. // then if it's over a super menu.
bool overSub = _OverSubmenu(fSelected, screenLocation); bool overSub = _OverSubmenu(fSelected, screenLocation);
item = _HitTestItems(location, B_ORIGIN); item = _HitTestItems(location, B_ORIGIN);
if (overSub) { if (overSub) {
@ -1453,21 +1453,21 @@ BMenu::_Track(int *action, long start)
// The following call blocks until the submenu // The following call blocks until the submenu
// gives control back to us, either because the mouse // gives control back to us, either because the mouse
// pointer goes out of the submenu's bounds, or because // pointer goes out of the submenu's bounds, or because
// the user closes the menu // the user closes the menu
BMenuItem *submenuItem = submenu->_Track(&submenuAction); BMenuItem *submenuItem = submenu->_Track(&submenuAction);
if (submenuAction == MENU_STATE_CLOSED) { if (submenuAction == MENU_STATE_CLOSED) {
item = submenuItem; item = submenuItem;
fState = MENU_STATE_CLOSED; fState = MENU_STATE_CLOSED;
} }
if (!LockLooper()) if (!LockLooper())
break; break;
} else if (item != NULL) { } else if (item != NULL) {
_UpdateStateOpenSelect(item, location, navAreaRectAbove, _UpdateStateOpenSelect(item, location, navAreaRectAbove,
navAreaRectBelow, selectedTime, navigationAreaTime); navAreaRectBelow, selectedTime, navigationAreaTime);
if (!releasedOnce) if (!releasedOnce)
releasedOnce = true; releasedOnce = true;
} else if (_OverSuper(screenLocation)) { } else if (_OverSuper(screenLocation)) {
fState = MENU_STATE_TRACKING; fState = MENU_STATE_TRACKING;
UnlockLooper(); UnlockLooper();
break; break;
} else { } else {
@ -1497,13 +1497,13 @@ BMenu::_Track(int *action, long start)
BPoint newLocation; BPoint newLocation;
uint32 newButtons; uint32 newButtons;
bigtime_t newPollTime = system_time(); bigtime_t newPollTime = system_time();
if (LockLooper()) { if (LockLooper()) {
GetMouse(&newLocation, &newButtons, true); GetMouse(&newLocation, &newButtons, true);
UnlockLooper(); UnlockLooper();
} }
// mouseSpeed in px per ms // mouseSpeed in px per ms
// (actually point_distance returns the square of the distance, // (actually point_distance returns the square of the distance,
// so it's more px^2 per ms) // so it's more px^2 per ms)
@ -1512,14 +1512,14 @@ BMenu::_Track(int *action, long start)
if (newLocation != location || newButtons != buttons) { if (newLocation != location || newButtons != buttons) {
if (!releasedOnce && newButtons == 0 && buttons != 0) if (!releasedOnce && newButtons == 0 && buttons != 0)
releasedOnce = true; releasedOnce = true;
location = newLocation; location = newLocation;
buttons = newButtons; buttons = newButtons;
} }
if (releasedOnce) if (releasedOnce)
_UpdateStateClose(item, location, buttons); _UpdateStateClose(item, location, buttons);
} }
} }
if (action != NULL) if (action != NULL)
@ -1548,7 +1548,7 @@ BMenu::_UpdateNavigationArea(BPoint position, BRect& navAreaRectAbove,
// submenus, as the cursor can be moved to submenu items directly instead // submenus, as the cursor can be moved to submenu items directly instead
// of having to move it horizontally into the submenu first. The concept // of having to move it horizontally into the submenu first. The concept
// is illustrated below: // is illustrated below:
// //
// +-------+----+---------+ // +-------+----+---------+
// | | /| | // | | /| |
// | | /*| | // | | /*| |
@ -1570,7 +1570,7 @@ BMenu::_UpdateNavigationArea(BPoint position, BRect& navAreaRectAbove,
// [3] Lower navigation area rectangle ('navAreaRectBelow') // [3] Lower navigation area rectangle ('navAreaRectBelow')
// [4] Upper navigation area // [4] Upper navigation area
// [5] Lower navigation area // [5] Lower navigation area
// [6] Submenu // [6] Submenu
// //
// The rectangles are used to calculate if the cursor is in the actual // The rectangles are used to calculate if the cursor is in the actual
// navigation area (see _UpdateStateOpenSelect()). // navigation area (see _UpdateStateOpenSelect()).
@ -1602,7 +1602,7 @@ BMenu::_UpdateNavigationArea(BPoint position, BRect& navAreaRectAbove,
navAreaRectBelow.Set(menuBounds.left, navAreaRectBelow.Set(menuBounds.left,
position.y, position.x - NAV_AREA_THRESHOLD, position.y, position.x - NAV_AREA_THRESHOLD,
submenuBounds.bottom); submenuBounds.bottom);
} }
} else { } else {
navAreaRectAbove = BRect(); navAreaRectAbove = BRect();
navAreaRectBelow = BRect(); navAreaRectBelow = BRect();
@ -1855,7 +1855,7 @@ BMenu::_LayoutItems(int32 index)
BSize BSize
BMenu::_ValidatePreferredSize() BMenu::_ValidatePreferredSize()
{ {
if (!fLayoutData->preferred.IsWidthSet() || ResizingMode() != fLayoutData->lastResizingMode) if (!fLayoutData->preferred.IsWidthSet() || ResizingMode() != fLayoutData->lastResizingMode)
_ComputeLayout(0, true, false, NULL, NULL); _ComputeLayout(0, true, false, NULL, NULL);
return fLayoutData->preferred; return fLayoutData->preferred;
@ -1869,7 +1869,7 @@ BMenu::_ComputeLayout(int32 index, bool bestFit, bool moveItems,
// TODO: Take "bestFit", "moveItems", "index" into account, // TODO: Take "bestFit", "moveItems", "index" into account,
// Recalculate only the needed items, // Recalculate only the needed items,
// not the whole layout every time // not the whole layout every time
fLayoutData->lastResizingMode = ResizingMode(); fLayoutData->lastResizingMode = ResizingMode();
BRect frame; BRect frame;
@ -2357,21 +2357,21 @@ BMenuItem *
BMenu::_NextItem(BMenuItem *item, bool forward) const BMenu::_NextItem(BMenuItem *item, bool forward) const
{ {
// go to next item, and skip over disabled items such as separators // go to next item, and skip over disabled items such as separators
int32 index = fItems.IndexOf(item); int32 index = fItems.IndexOf(item);
const int32 numItems = fItems.CountItems(); const int32 numItems = fItems.CountItems();
if (index < 0) { if (index < 0) {
if (forward) if (forward)
index = -1; index = -1;
else else
index = numItems; index = numItems;
} }
int32 startIndex = index; int32 startIndex = index;
do { do {
if (forward) if (forward)
index++; index++;
else else
index--; index--;
// cycle through menu items // cycle through menu items
if (index < 0) if (index < 0)
index = numItems - 1; index = numItems - 1;
@ -2398,7 +2398,7 @@ BMenu::_SetStickyMode(bool on)
{ {
if (fStickyMode == on) if (fStickyMode == on)
return; return;
fStickyMode = on; fStickyMode = on;
// If we are switching to sticky mode, propagate the status // If we are switching to sticky mode, propagate the status
@ -2579,7 +2579,7 @@ BMenu::_QuitTracking(bool onlyThis)
// Close the whole menu hierarchy // Close the whole menu hierarchy
if (!onlyThis && _IsStickyMode()) if (!onlyThis && _IsStickyMode())
_SetStickyMode(false); _SetStickyMode(false);
_Hide(); _Hide();
} }
@ -2628,7 +2628,7 @@ get_menu_info(menu_info *info)
// MenuPrivate // MenuPrivate
namespace BPrivate { namespace BPrivate {
MenuPrivate::MenuPrivate(BMenu *menu) MenuPrivate::MenuPrivate(BMenu *menu)
: :
fMenu(menu) fMenu(menu)
@ -2656,7 +2656,7 @@ MenuPrivate::CacheFontInfo()
fMenu->_CacheFontInfo(); fMenu->_CacheFontInfo();
} }
float float
MenuPrivate::FontHeight() const MenuPrivate::FontHeight() const
{ {
@ -2699,7 +2699,7 @@ MenuPrivate::State(BMenuItem **item) const
return fMenu->_State(item); return fMenu->_State(item);
} }
void void
MenuPrivate::Install(BWindow *window) MenuPrivate::Install(BWindow *window)
{ {