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

* use B_RGBA32 icons in shutdown process window (untested)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19313 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2006-11-17 09:56:42 +00:00
parent 76788886af
commit fa4cfdbf62
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/registrar/ShutdownProcess.cpp
+13 -3
View File
@@ -555,7 +555,12 @@ private:
FillRect(Bounds(), B_SOLID_LOW); FillRect(Bounds(), B_SOLID_LOW);
if (fAppInfo && fAppInfo->largeIcon) { if (fAppInfo && fAppInfo->largeIcon) {
SetDrawingMode(B_OP_OVER); if (fAppInfo->largeIcon->ColorSpace() == B_RGBA32) {
SetDrawingMode(B_OP_ALPHA);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
} else
SetDrawingMode(B_OP_OVER);
DrawBitmap(fAppInfo->largeIcon, BPoint(0, 0)); DrawBitmap(fAppInfo->largeIcon, BPoint(0, 0));
} }
} }
@@ -975,9 +980,14 @@ ShutdownProcess::_AddShutdownWindowApps(AppInfoList &infos)
} }
// get the application icons // get the application icons
#ifdef __HAIKU__
color_space format = B_RGBA32;
#else
color_space format = B_CMAP8;
#endif
// mini icon // mini icon
BBitmap *miniIcon = new(nothrow) BBitmap(BRect(0, 0, 15, 15), B_CMAP8); BBitmap *miniIcon = new(nothrow) BBitmap(BRect(0, 0, 15, 15), format);
if (miniIcon != NULL) { if (miniIcon != NULL) {
error = miniIcon->InitCheck(); error = miniIcon->InitCheck();
if (error == B_OK) if (error == B_OK)
@@ -989,7 +999,7 @@ ShutdownProcess::_AddShutdownWindowApps(AppInfoList &infos)
} }
// mini icon // mini icon
BBitmap *largeIcon = new(nothrow) BBitmap(BRect(0, 0, 31, 31), B_CMAP8); BBitmap *largeIcon = new(nothrow) BBitmap(BRect(0, 0, 31, 31), format);
if (largeIcon != NULL) { if (largeIcon != NULL) {
error = largeIcon->InitCheck(); error = largeIcon->InitCheck();
if (error == B_OK) if (error == B_OK)