From 741b3d900407a351d228e11d6e7a2b1dfed1f2f3 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Thu, 17 Jul 2008 19:32:57 +0000 Subject: [PATCH] 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 --- src/kits/tracker/IconMenuItem.cpp | 6 +++--- src/kits/tracker/TrackerInitialState.cpp | 2 +- src/preferences/filetypes/IconView.cpp | 2 +- src/preferences/filetypes/MimeTypeListView.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kits/tracker/IconMenuItem.cpp b/src/kits/tracker/IconMenuItem.cpp index edae0e6627..e3ada34bc5 100644 --- a/src/kits/tracker/IconMenuItem.cpp +++ b/src/kits/tracker/IconMenuItem.cpp @@ -266,7 +266,7 @@ IconMenuItem::IconMenuItem(const char *label, BMessage *message, { if (nodeInfo) { #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 fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8); #endif @@ -291,7 +291,7 @@ IconMenuItem::IconMenuItem(const char *label, BMessage *message, { BMimeType mime(iconType); #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 fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8); #endif @@ -315,7 +315,7 @@ IconMenuItem::IconMenuItem(BMenu *submenu, BMessage *message, { BMimeType mime(iconType); #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 fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8); #endif diff --git a/src/kits/tracker/TrackerInitialState.cpp b/src/kits/tracker/TrackerInitialState.cpp index 467c94f44b..38eaadef39 100644 --- a/src/kits/tracker/TrackerInitialState.cpp +++ b/src/kits/tracker/TrackerInitialState.cpp @@ -167,7 +167,7 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID, #endif #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 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); diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp index 8ba4a04184..0381979af0 100644 --- a/src/preferences/filetypes/IconView.cpp +++ b/src/preferences/filetypes/IconView.cpp @@ -860,7 +860,7 @@ IconView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage) icon->CopyTo(message); - BBitmap *dragBitmap = new BBitmap(fIcon->Bounds(), B_RGB32, true); + BBitmap *dragBitmap = new BBitmap(fIcon->Bounds(), B_RGBA32, true); dragBitmap->Lock(); BView *view = new BView(dragBitmap->Bounds(), B_EMPTY_STRING, B_FOLLOW_NONE, 0); dragBitmap->AddChild(view); diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp index caf9533acf..4749db6934 100644 --- a/src/preferences/filetypes/MimeTypeListView.cpp +++ b/src/preferences/filetypes/MimeTypeListView.cpp @@ -90,7 +90,7 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete) } #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 BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8); #endif