Use B_RGBA32 instead of B_RGB32 when getting vector icons. Should fix bug #2525.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26474 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -266,7 +266,7 @@ IconMenuItem::IconMenuItem(const char *label, BMessage *message,
|
|||||||
{
|
{
|
||||||
if (nodeInfo) {
|
if (nodeInfo) {
|
||||||
#ifdef __HAIKU__
|
#ifdef __HAIKU__
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGBA32);
|
||||||
#else
|
#else
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
||||||
#endif
|
#endif
|
||||||
@@ -291,7 +291,7 @@ IconMenuItem::IconMenuItem(const char *label, BMessage *message,
|
|||||||
{
|
{
|
||||||
BMimeType mime(iconType);
|
BMimeType mime(iconType);
|
||||||
#ifdef __HAIKU__
|
#ifdef __HAIKU__
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGBA32);
|
||||||
#else
|
#else
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
||||||
#endif
|
#endif
|
||||||
@@ -315,7 +315,7 @@ IconMenuItem::IconMenuItem(BMenu *submenu, BMessage *message,
|
|||||||
{
|
{
|
||||||
BMimeType mime(iconType);
|
BMimeType mime(iconType);
|
||||||
#ifdef __HAIKU__
|
#ifdef __HAIKU__
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGBA32);
|
||||||
#else
|
#else
|
||||||
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __HAIKU__
|
#ifdef __HAIKU__
|
||||||
BBitmap vectorIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_RGB32);
|
BBitmap vectorIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_RGBA32);
|
||||||
#endif
|
#endif
|
||||||
BBitmap largeIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_CMAP8);
|
BBitmap largeIcon(BRect(0, 0, 31, 31), B_BITMAP_NO_SERVER_LINK, B_CMAP8);
|
||||||
BBitmap miniIcon(BRect(0, 0, 15, 15), B_BITMAP_NO_SERVER_LINK, B_CMAP8);
|
BBitmap miniIcon(BRect(0, 0, 15, 15), B_BITMAP_NO_SERVER_LINK, B_CMAP8);
|
||||||
|
|||||||
@@ -860,7 +860,7 @@ IconView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
|
|||||||
|
|
||||||
icon->CopyTo(message);
|
icon->CopyTo(message);
|
||||||
|
|
||||||
BBitmap *dragBitmap = new BBitmap(fIcon->Bounds(), B_RGB32, true);
|
BBitmap *dragBitmap = new BBitmap(fIcon->Bounds(), B_RGBA32, true);
|
||||||
dragBitmap->Lock();
|
dragBitmap->Lock();
|
||||||
BView *view = new BView(dragBitmap->Bounds(), B_EMPTY_STRING, B_FOLLOW_NONE, 0);
|
BView *view = new BView(dragBitmap->Bounds(), B_EMPTY_STRING, B_FOLLOW_NONE, 0);
|
||||||
dragBitmap->AddChild(view);
|
dragBitmap->AddChild(view);
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
|
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
|
||||||
BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_RGB32);
|
BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_RGBA32);
|
||||||
#else
|
#else
|
||||||
BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8);
|
BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user