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

BookmarkBar: style fixes and some error checking.

Browse Source 
Thanks to axel for reviewing.
This commit is contained in:
Adrien Destugues
2014-05-26 09:13:46 +02:00
parent 6ed2992fb6
commit 549314746b
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BookmarkBar.cpp
+11 -12
View File
@@ -19,13 +19,13 @@
BookmarkBar::BookmarkBar(const char* title, BHandler* target, BookmarkBar::BookmarkBar(const char* title, BHandler* target,
const entry_ref* navDir) const entry_ref* navDir)
: BMenuBar(title) :
BMenuBar(title)
{ {
SetFlags(Flags() | B_FRAME_EVENTS); SetFlags(Flags() | B_FRAME_EVENTS);
BEntry(navDir).GetNodeRef(&fNodeRef); BEntry(navDir).GetNodeRef(&fNodeRef);
fOverflowMenu = new BMenu(B_UTF8_ELLIPSIS); fOverflowMenu = new BMenu(B_UTF8_ELLIPSIS);
AddItem(fOverflowMenu); AddItem(fOverflowMenu);
} }
@@ -47,7 +47,7 @@ BookmarkBar::AttachedToWindow()
BEntry bookmark; BEntry bookmark;
while (dir.GetNextEntry(&bookmark) == B_OK) { while (dir.GetNextEntry(&bookmark) == B_OK) {
node_ref ref; node_ref ref;
bookmark.GetNodeRef(&ref); if (bookmark.GetNodeRef(&ref) == B_OK)
_AddItem(ref.node, &bookmark); _AddItem(ref.node, &bookmark);
} }
} }
@@ -73,13 +73,13 @@ BookmarkBar::MessageReceived(BMessage* message)
ref.set_name(name); ref.set_name(name);
BEntry entry(&ref); BEntry entry(&ref);
if (entry.InitCheck() == B_OK)
_AddItem(inode, &entry); _AddItem(inode, &entry);
break; break;
} }
case B_ENTRY_MOVED: case B_ENTRY_MOVED:
{ {
if (fItemsMap[inode] == NULL) if (fItemsMap[inode] == NULL) {
{
entry_ref ref; entry_ref ref;
const char *name; const char *name;
@@ -97,10 +97,9 @@ BookmarkBar::MessageReceived(BMessage* message)
ino_t from, to; ino_t from, to;
message->FindInt64("to directory", &to); message->FindInt64("to directory", &to);
message->FindInt64("from directory", &from); message->FindInt64("from directory", &from);
if (from == to) if (from == to) {
{
const char *name; const char *name;
message->FindString("name", &name); if (message->FindString("name", &name) == B_OK)
fItemsMap[inode]->SetLabel(name); fItemsMap[inode]->SetLabel(name);
break; break;
} }
@@ -113,6 +112,7 @@ BookmarkBar::MessageReceived(BMessage* message)
{ {
IconMenuItem* item = fItemsMap[inode]; IconMenuItem* item = fItemsMap[inode];
RemoveItem(item); RemoveItem(item);
fOverflowMenu->RemoveItem(item);
fItemsMap.erase(inode); fItemsMap.erase(inode);
delete item; delete item;
} }
@@ -145,7 +145,7 @@ BookmarkBar::FrameResized(float width, float height)
// See if we can move some items from the "more" menu in the remaining // See if we can move some items from the "more" menu in the remaining
// space. // space.
BMenuItem* extraItem = fOverflowMenu->ItemAt(0); BMenuItem* extraItem = fOverflowMenu->ItemAt(0);
while (extraItem) { while (extraItem != NULL) {
BRect frame = extraItem->Frame(); BRect frame = extraItem->Frame();
if (frame.Width() + rightmost > width - 32) if (frame.Width() + rightmost > width - 32)
break; break;
@@ -158,7 +158,7 @@ BookmarkBar::FrameResized(float width, float height)
} else { } else {
// Remove any overflowing item and move them to the "more" menu. // Remove any overflowing item and move them to the "more" menu.
for (int j = i; j < count; j++) for (int j = i; j < count; j++)
fOverflowMenu->AddItem(RemoveItem(j), 0); fOverflowMenu->AddItem(RemoveItem(j));
} }
} }
@@ -205,8 +205,7 @@ BookmarkBar::_AddItem(ino_t inode, BEntry* entry)
BMessage* message = new BMessage(B_REFS_RECEIVED); BMessage* message = new BMessage(B_REFS_RECEIVED);
message->AddRef("refs", &ref); message->AddRef("refs", &ref);
item = new IconMenuItem(name, message, &info, item = new IconMenuItem(name, message, &info, B_MINI_ICON);
B_MINI_ICON);
} }
BMenuBar::AddItem(item, CountItems() - 1); BMenuBar::AddItem(item, CountItems() - 1);