diff --git a/src/helpers/Utils.cpp b/src/helpers/Utils.cpp index 35a79f57..bad70bba 100644 --- a/src/helpers/Utils.cpp +++ b/src/helpers/Utils.cpp @@ -54,20 +54,20 @@ GetFileExtension(const std::string filename) } -void +status_t GetVectorIcon(const std::string icon, BBitmap* bitmap) { if(bitmap == nullptr) - return; + return B_ERROR; BResources* resources = BApplication::AppResources(); size_t size; const uint8* rawIcon; rawIcon = (const uint8*) resources->LoadResource(B_VECTOR_ICON_TYPE, icon.c_str(), &size); if(rawIcon == nullptr) - return; + return B_ERROR; - BIconUtils::GetVectorIcon(rawIcon, size, bitmap); + return BIconUtils::GetVectorIcon(rawIcon, size, bitmap); } diff --git a/src/helpers/Utils.h b/src/helpers/Utils.h index d1a12ba3..2c731ce5 100644 --- a/src/helpers/Utils.h +++ b/src/helpers/Utils.h @@ -30,7 +30,7 @@ struct entry_ref; std::string GetFileName(const std::string filename); std::string GetFileExtension(const std::string filename); // Gets an icon from executable's resources -void GetVectorIcon(const std::string icon, BBitmap* bitmap); +status_t GetVectorIcon(const std::string icon, BBitmap* bitmap); std::string ParseFileArgument(const std::string argument, diff --git a/src/ui/FunctionsOutlineView.cpp b/src/ui/FunctionsOutlineView.cpp index 9f72a3fd..dd48d565 100755 --- a/src/ui/FunctionsOutlineView.cpp +++ b/src/ui/FunctionsOutlineView.cpp @@ -151,7 +151,7 @@ SymbolListItem::SetIconAndTooltip() toolTip = B_TRANSLATE("Null"); break; case SymbolKind::EnumMember: - iconName = "emum-member"; + iconName = "enum-member"; toolTip = B_TRANSLATE("Enum member"); break; case SymbolKind::Struct: diff --git a/src/ui/StyledItem.cpp b/src/ui/StyledItem.cpp index f4addbbf..eef9216c 100644 --- a/src/ui/StyledItem.cpp +++ b/src/ui/StyledItem.cpp @@ -184,14 +184,18 @@ StyledItem::DrawIcon(BView* owner, const BRect& itemBounds, else iconName.Prepend("dark-"); } - GetVectorIcon(iconName.String(), icon); BPoint iconStartingPoint(itemBounds.left + 4.0f, itemBounds.top + (itemBounds.Height() - iconSize) / 2.0f); - if (icon != nullptr) { + + if (GetVectorIcon(iconName.String(), icon) == B_OK) { owner->SetDrawingMode(B_OP_ALPHA); owner->DrawBitmap(icon, iconStartingPoint); - delete icon; + } else { + BString error(fIconName); + error << ": icon not found!"; + debugger(error.String()); } + delete icon; return BRect(iconStartingPoint, BSize(iconSize, iconSize)); }