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

Tracker: Fix accidental logic reversal in a66ee36

Browse Source 
should be: if (!container || suppressFolderHierarchy)

also rename container to isContainer
This commit is contained in:
John Scipione
2014-06-21 03:02:52 -04:00
parent 546ec3bcf9
commit 7dbe212003
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/NavMenu.cpp
+7 -8
View File
@@ -393,6 +393,7 @@ BNavMenu::ClearMenuBuildingState()
int32 count = fItemList->CountItems(); int32 count = fItemList->CountItems();
for (int32 index = count - 1; index >= 0; index--) for (int32 index = count - 1; index >= 0; index--)
delete RemoveItem(index); delete RemoveItem(index);
delete fItemList; delete fItemList;
fItemList = NULL; fItemList = NULL;
} }
@@ -579,7 +580,7 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
return 0; return 0;
entry_ref ref; entry_ref ref;
bool container = false; bool isContainer = false;
if (model->IsSymLink()) { if (model->IsSymLink()) {
Model* newResolvedModel = 0; Model* newResolvedModel = 0;
Model* result = model->LinkTo(); Model* result = model->LinkTo();
@@ -617,13 +618,13 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
} }
ref = *result->EntryRef(); ref = *result->EntryRef();
container = result->IsContainer(); isContainer = result->IsContainer();
} }
model->SetLinkTo(result); model->SetLinkTo(result);
} else { } else {
ref = *model->EntryRef(); ref = *model->EntryRef();
container = model->IsContainer(); isContainer = model->IsContainer();
} }
BMessage* message = new BMessage(*invokeMessage); BMessage* message = new BMessage(*invokeMessage);
@@ -635,7 +636,7 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
GetMaxMenuWidth()); GetMaxMenuWidth());
ModelMenuItem* item = NULL; ModelMenuItem* item = NULL;
if (container || suppressFolderHierarchy) { if (!isContainer || suppressFolderHierarchy) {
item = new ModelMenuItem(model, truncatedString.String(), message); item = new ModelMenuItem(model, truncatedString.String(), message);
if (invokeMessage->what != B_REFS_RECEIVED) if (invokeMessage->what != B_REFS_RECEIVED)
item->SetEnabled(false); item->SetEnabled(false);
@@ -644,7 +645,6 @@ BNavMenu::NewModelItem(Model* model, const BMessage* invokeMessage,
} else { } else {
BNavMenu* menu = new BNavMenu(truncatedString.String(), BNavMenu* menu = new BNavMenu(truncatedString.String(),
invokeMessage->what, target, parentWindow, typeslist); invokeMessage->what, target, parentWindow, typeslist);
menu->SetNavDir(&ref); menu->SetNavDir(&ref);
if (hook != NULL) { if (hook != NULL) {
menu->InitTrackingHook(hook->fTrackingHook, &(hook->fTarget), menu->InitTrackingHook(hook->fTrackingHook, &(hook->fTarget),
@@ -801,12 +801,11 @@ BNavMenu::AddNavParentDir(const char* name,const Model* model,
menu->SetNavDir(model->EntryRef()); menu->SetNavDir(model->EntryRef());
menu->SetShowParent(true); menu->SetShowParent(true);
menu->InitTrackingHook(fTrackingHook.fTrackingHook, menu->InitTrackingHook(fTrackingHook.fTrackingHook,
&fTrackingHook.fTarget, fTrackingHook.fDragMessage); &(fTrackingHook.fTarget), fTrackingHook.fDragMessage);
BMenuItem* item = new SpecialModelMenuItem(model, menu); BMenuItem* item = new SpecialModelMenuItem(model, menu);
BMessage* message = new BMessage(what); BMessage* message = new BMessage(what);
message->AddRef("refs",model->EntryRef()); message->AddRef("refs", model->EntryRef());
item->SetMessage(message); item->SetMessage(message);
AddItem(item); AddItem(item);