Ticket #1033: IconMenuItem.cpp.diff

/boot/home/Desktop/IconMenuItem.cpp

@@ -251 +251 @@
     fDeviceIcon(NULL)
 {
     if (nodeInfo) {
-        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
         if (nodeInfo->GetTrackerIcon(fDeviceIcon, B_MINI_ICON)) {
             delete fDeviceIcon;
             fDeviceIcon = NULL;
@@ -270 +270 @@
     fDeviceIcon(NULL)
 {
     BMimeType mime(iconType);
-    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
 
     if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
         delete fDeviceIcon;
@@ -289 +289 @@
     fDeviceIcon(NULL)
 {
     BMimeType mime(iconType);
-    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
 
     if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
         delete fDeviceIcon;
@@ -325 +325 @@
     Menu()->MovePenTo(drawPoint);
     _inherited::DrawContent();
     
-    BPoint where(ContentLocation());
-    where.y = Frame().top;
+    Menu()->PushState();
     
+    BPoint where(ContentLocation());
+    where.y = Frame().top + 2;
+
     if (fDeviceIcon) {
-        if (IsEnabled())
-            Menu()->SetDrawingMode(B_OP_OVER);
-        else
-            Menu()->SetDrawingMode(B_OP_BLEND); 
-        
+        if (IsEnabled()) {
+            Menu()->SetDrawingMode(B_OP_ALPHA);
+        }
+        else {
+            Menu()->SetDrawingMode(B_OP_ALPHA); 
+            Menu()->SetDrawingMode(B_OP_ALPHA);
+            Menu()->SetHighColor(0, 0, 0, 64);
+            Menu()->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_OVERLAY);
+        }       
+
         Menu()->DrawBitmapAsync(fDeviceIcon, where);
     }
+    
+    Menu()->PopState();
 }