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

If can't find generic 3 boxes icon, fill with transparent.

Browse Source 
If we can't find the generic 3 boxes icon we are really in trouble.
But, showing garbage is not the right answer. Instead, fill the
icon with transparent pixels. Tested all code paths. Hopefully this
code will never need to be executed.

* Rename kIconFormat to kIconColorSpace
This commit is contained in:
John Scipione 2012-04-11 23:48:54 -04:00
parent b97545d7ab
commit 1a9e959932
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/apps/deskbar/BarApp.cpp
View File

@ -74,7 +74,7 @@ const uint32 kShowDeskbarMenu = 'BeMn';
const uint32 kShowTeamMenu = 'TmMn';
static const color_space kIconFormat = B_RGBA32;
static const color_space kIconColorSpace = B_RGBA32;
int
@ -749,7 +749,7 @@ TBarApp::AddTeam(team_id team, uint32 flags, const char* sig, entry_ref* ref)
}
BarTeamInfo* barInfo = new BarTeamInfo(new BList(), flags, strdup(sig),
new BBitmap(IconRect(), kIconFormat), strdup(ref->name));
new BBitmap(IconRect(), kIconColorSpace), strdup(ref->name));
if ((barInfo->flags & B_BACKGROUND_APP) == 0
&& strcasecmp(barInfo->sig, kDeskbarSignature) != 0) {
@ -828,7 +828,7 @@ TBarApp::ResizeTeamIcons()
if ((barInfo->flags & B_BACKGROUND_APP) == 0
&& strcasecmp(barInfo->sig, kDeskbarSignature) != 0) {
delete barInfo->icon;
barInfo->icon = new BBitmap(IconRect(), kIconFormat);
barInfo->icon = new BBitmap(IconRect(), kIconColorSpace);
FetchAppIcon(barInfo->sig, barInfo->icon);
}
}
@ -870,10 +870,27 @@ TBarApp::FetchAppIcon(const char* signature, BBitmap* icon)
}
if (!foundIcon) {
// Get the generic 3 boxes icon
// get the generic 3 boxes icon
BMimeType defaultAppMime;
defaultAppMime.SetTo(B_APP_MIME_TYPE);
defaultAppMime.GetIcon(icon, size);
if (defaultAppMime.GetIcon(icon, size) != B_OK) {
// couldn't find generic 3 boxes icon
// fill with transparent
uint8 *iconBits = (uint8*)icon->Bits();
if (icon->ColorSpace() == B_RGBA32) {
int32 i = 0;
while (i < icon->BitsLength()) {
iconBits[i++] = B_TRANSPARENT_32_BIT.red;
iconBits[i++] = B_TRANSPARENT_32_BIT.green;
iconBits[i++] = B_TRANSPARENT_32_BIT.blue;
iconBits[i++] = B_TRANSPARENT_32_BIT.alpha;
}
} else {
// Assume B_CMAP8
for (int32 i = 0; i < icon->BitsLength(); i++)
iconBits[i] = B_TRANSPARENT_MAGIC_CMAP8;
}
}
}
}