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

Use the private menu actions defines. Small cleanups.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12985 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-06-07 13:35:16 +00:00
parent 88da217a0b
commit fd083d7eed
2 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+41 -30
View File
@@ -34,6 +34,7 @@
#include <Screen.h> #include <Screen.h>
#include <Window.h> #include <Window.h>
#include <MenuPrivate.h>
#include <MenuWindow.h> #include <MenuWindow.h>
#ifndef COMPILE_FOR_R5 #ifndef COMPILE_FOR_R5
@@ -117,7 +118,7 @@ sPropList[] = {
BMenu::BMenu(const char *name, menu_layout layout) BMenu::BMenu(const char *name, menu_layout layout)
// : BView(BRect(), name, 0, B_WILL_DRAW), // : BView(BRect(), name, 0, B_WILL_DRAW),
: BView(BRect(0.0, 0.0, 5.0, 5.0), name, 0, B_WILL_DRAW), : BView(BRect(0.0, 0.0, 5.0, 5.0), name, 0, B_WILL_DRAW),
fChosenItem(NULL), fChosenItem(NULL),
fPad(14.0f, 2.0f, 20.0f, 0.0f), fPad(14.0f, 2.0f, 20.0f, 0.0f),
fSelected(NULL), fSelected(NULL),
@@ -810,12 +811,10 @@ BMenu::ResolveSpecifier(BMessage *msg, int32 index,
status_t status_t
BMenu::GetSupportedSuites(BMessage *data) BMenu::GetSupportedSuites(BMessage *data)
{ {
status_t err;
if (data == NULL) if (data == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
err = data->AddString("suites", "suite/vnd.Be-menu"); status_t err = data->AddString("suites", "suite/vnd.Be-menu");
if (err < B_OK) if (err < B_OK)
return err; return err;
@@ -1105,7 +1104,7 @@ BMenu::_track(int *action, long start)
BPoint location; BPoint location;
ulong buttons; ulong buttons;
BMenuItem *item = NULL; BMenuItem *item = NULL;
int localAction = 0; int localAction = MENU_ACT_NONE;
do { do {
if (LockLooper()) { if (LockLooper()) {
GetMouse(&location, &buttons); GetMouse(&location, &buttons);
@@ -1120,7 +1119,7 @@ BMenu::_track(int *action, long start)
if (item != fSelected) if (item != fSelected)
SelectItem(item); SelectItem(item);
int submenuAction = 0; int submenuAction = MENU_ACT_NONE;
BMenuItem *submenuItem = NULL; BMenuItem *submenuItem = NULL;
// TODO: Review this as it doesn't work very well, // TODO: Review this as it doesn't work very well,
// BMenu::_track() isn't always called when needed. // BMenu::_track() isn't always called when needed.
@@ -1128,7 +1127,7 @@ BMenu::_track(int *action, long start)
UnlockLooper(); UnlockLooper();
submenuItem = item->Submenu()->_track(&submenuAction); submenuItem = item->Submenu()->_track(&submenuAction);
if (submenuAction == 5) { if (submenuAction == MENU_ACT_CLOSE) {
item = submenuItem; item = submenuItem;
localAction = submenuAction; localAction = submenuAction;
break; break;
@@ -1145,15 +1144,11 @@ BMenu::_track(int *action, long start)
snooze(50000); snooze(50000);
} while (buttons != 0); } while (buttons != 0);
// TODO: A deeper investigation of actions if (localAction == MENU_ACT_NONE) {
// would be nice. Consider building an enum
// with the possible actions, and putting it in a
// private, shared header (BMenuBar needs to know about them too).
if (localAction == 0) {
if (buttons != 0) if (buttons != 0)
localAction = 0; localAction = MENU_ACT_NONE;
else else
localAction = 5; localAction = MENU_ACT_CLOSE;
} }
if (action != NULL) if (action != NULL)
@@ -1258,11 +1253,13 @@ void
BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems, BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
float* width, float* height) float* width, float* height)
{ {
// TODO: Take "bestFit", "moveItems", "index" into account. // TODO: Take "bestFit", "moveItems", "index" into account,
// Recalculate only the needed items,
// not the whole layout every time
BRect frame(0, 0, 0, 0); BRect frame(0, 0, 0, 0);
float iWidth, iHeight; float iWidth, iHeight;
BMenuItem *item = NULL; BMenuItem *item = NULL;
switch (fLayout) { switch (fLayout) {
case B_ITEMS_IN_COLUMN: case B_ITEMS_IN_COLUMN:
{ {
@@ -1270,14 +1267,14 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
item = ItemAt(i); item = ItemAt(i);
if (item != NULL) { if (item != NULL) {
item->GetContentSize(&iWidth, &iHeight); item->GetContentSize(&iWidth, &iHeight);
if (item->fModifiers && item->fShortcutChar) if (item->fModifiers && item->fShortcutChar)
iWidth += 25.0f; iWidth += 25.0f;
item->fBounds.left = 0.0f; item->fBounds.left = 0.0f;
item->fBounds.top = frame.bottom; item->fBounds.top = frame.bottom;
item->fBounds.bottom = item->fBounds.top + iHeight + fPad.top + fPad.bottom; item->fBounds.bottom = item->fBounds.top + iHeight + fPad.top + fPad.bottom;
frame.right = max_c(frame.right, iWidth + fPad.left + fPad.right) + 20; frame.right = max_c(frame.right, iWidth + fPad.left + fPad.right) + 20;
frame.bottom = item->fBounds.bottom + 1.0f; frame.bottom = item->fBounds.bottom + 1.0f;
} }
@@ -1295,26 +1292,26 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
{ {
font_height fh; font_height fh;
GetFontHeight(&fh); GetFontHeight(&fh);
frame = BRect(0.0f, 0.0f, 0.0f, frame = BRect(0.0f, 0.0f, 0.0f,
(float)ceil(fh.ascent) + (float)ceil(fh.descent) + fPad.top + fPad.bottom); (float)ceil(fh.ascent) + (float)ceil(fh.descent) + fPad.top + fPad.bottom);
for (int32 i = 0; i < fItems.CountItems(); i++) { for (int32 i = 0; i < fItems.CountItems(); i++) {
item = ItemAt(i); item = ItemAt(i);
if (item != NULL) { if (item != NULL) {
item->GetContentSize(&iWidth, &iHeight); item->GetContentSize(&iWidth, &iHeight);
item->fBounds.left = frame.right; item->fBounds.left = frame.right;
item->fBounds.top = 0.0f; item->fBounds.top = 0.0f;
item->fBounds.right = item->fBounds.left + iWidth + fPad.left + fPad.right; item->fBounds.right = item->fBounds.left + iWidth + fPad.left + fPad.right;
frame.right = item->fBounds.right + 1.0f; frame.right = item->Frame().right + 1.0f;
frame.bottom = max_c(frame.bottom, iHeight + fPad.top + fPad.bottom); frame.bottom = max_c(frame.bottom, iHeight + fPad.top + fPad.bottom);
} }
} }
for (int32 i = 0; i < fItems.CountItems(); i++) for (int32 i = 0; i < fItems.CountItems(); i++)
ItemAt(i)->fBounds.bottom = frame.bottom; ItemAt(i)->fBounds.bottom = frame.bottom;
frame.right = (float)ceil(frame.right) + 8.0f; frame.right = (float)ceil(frame.right) + 8.0f;
break; break;
} }
@@ -1336,7 +1333,7 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
default: default:
break; break;
} }
// This is for BMenuBar. // This is for BMenuBar.
if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) { if ((ResizingMode() & B_FOLLOW_LEFT_RIGHT) == B_FOLLOW_LEFT_RIGHT) {
if (Parent()) if (Parent())
@@ -1433,7 +1430,7 @@ BMenu::OverSubmenu(BMenuItem *item, BPoint loc)
{ {
// we assume that loc is in screen coords // we assume that loc is in screen coords
BMenu *subMenu = item->Submenu(); BMenu *subMenu = item->Submenu();
if (subMenu == NULL) if (subMenu == NULL || subMenu->Window() == NULL)
return false; return false;
if (subMenu->Window()->Frame().Contains(loc)) if (subMenu->Window()->Frame().Contains(loc))
@@ -1557,14 +1554,28 @@ BMenu::CurrentSelection() const
bool bool
BMenu::SelectNextItem(BMenuItem *item, bool forward) BMenu::SelectNextItem(BMenuItem *item, bool forward)
{ {
return false; BMenuItem *nextItem = NextItem(item, forward);
if (nextItem == NULL)
return false;
SelectItem(nextItem);
return true;
} }
BMenuItem * BMenuItem *
BMenu::NextItem(BMenuItem *item, bool forward) const BMenu::NextItem(BMenuItem *item, bool forward) const
{ {
return NULL; int32 index = fItems.IndexOf(item);
if (forward)
index++;
else
index--;
if (index < 0 || index >= fItems.CountItems())
return NULL;
return ItemAt(index);
} }
src/kits/interface/MenuBar.cpp
+6 -7
View File
@@ -33,6 +33,7 @@
#include <Window.h> #include <Window.h>
#include <AppMisc.h> #include <AppMisc.h>
#include <MenuPrivate.h>
#include <TokenSpace.h> #include <TokenSpace.h>
struct menubar_data struct menubar_data
@@ -142,8 +143,7 @@ BMenuBar::Draw(BRect updateRect)
// Restore the background color in case a menuitem // Restore the background color in case a menuitem
// was selected. // was selected.
SetHighColor(ui_color(B_MENU_BACKGROUND_COLOR)); DrawBackground(bounds & updateRect);
FillRect(bounds & updateRect);
SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_LIGHTEN_2_TINT)); SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_LIGHTEN_2_TINT));
StrokeLine(BPoint(0.0f, bounds.bottom - 2.0f), BPoint(0.0f, 0.0f)); StrokeLine(BPoint(0.0f, bounds.bottom - 2.0f), BPoint(0.0f, 0.0f));
@@ -399,7 +399,7 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
// but doesn't work well // but doesn't work well
BMenuItem *resultItem = NULL; BMenuItem *resultItem = NULL;
BWindow *window = Window(); BWindow *window = Window();
int localAction; int localAction = MENU_ACT_NONE;
bool exitLoop = false; bool exitLoop = false;
do { do {
if (window->LockWithTimeout(200000) < B_OK) if (window->LockWithTimeout(200000) < B_OK)
@@ -436,8 +436,7 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
if (window->LockWithTimeout(200000) < B_OK) if (window->LockWithTimeout(200000) < B_OK)
break; break;
// the returned action is "5" when the BMenu is closed. } while (localAction != MENU_ACT_CLOSE);
} while (localAction != 5);
} }
if (window->IsLocked()) { if (window->IsLocked()) {
@@ -478,7 +477,7 @@ BMenuBar::StealFocus()
} }
} }
/*
void void
BMenuBar::RestoreFocus() BMenuBar::RestoreFocus()
{ {
@@ -495,7 +494,7 @@ BMenuBar::RestoreFocus()
window->Unlock(); window->Unlock();
} }
} }
*/
void void
BMenuBar::InitData(menu_layout layout) BMenuBar::InitData(menu_layout layout)