Ticket #1033: IconMenuItem.cpp.2.diff

/boot/home/Desktop/IconMenuItem.cpp

@@ -251 +251 @@
     fDeviceIcon(NULL)
 {
     if (nodeInfo) {
+#ifdef __HAIKU__
+        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
+#else
         fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+#endif
+
         if (nodeInfo->GetTrackerIcon(fDeviceIcon, B_MINI_ICON)) {
             delete fDeviceIcon;
             fDeviceIcon = NULL;
@@ -269 +274 @@
     : PositionPassingMenuItem(label, message),
     fDeviceIcon(NULL)
 {
-    BMimeType mime(iconType);
+    BMimeType mime(iconType);   
+#ifdef __HAIKU__
+    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
+#else
     fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+#endif
 
     if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
         delete fDeviceIcon;
@@ -289 +298 @@
     fDeviceIcon(NULL)
 {
     BMimeType mime(iconType);
+#ifdef __HAIKU__
+    fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGB32);
+#else
     fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
+#endif
 
     if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
         delete fDeviceIcon;
@@ -324 +337 @@
     drawPoint.x += 20;
     Menu()->MovePenTo(drawPoint);
     _inherited::DrawContent();
-    
+
     BPoint where(ContentLocation());
-    where.y = Frame().top;
-    
+    where.y = Frame().top + 2;
+
     if (fDeviceIcon) {
         if (IsEnabled())
+#ifdef __HAIKU__
+            Menu()->SetDrawingMode(B_OP_ALPHA);
+        else {
+            Menu()->SetDrawingMode(B_OP_ALPHA);
+            Menu()->SetHighColor(0, 0, 0, 64);
+            Menu()->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_OVERLAY);
+        }       
+#else
             Menu()->SetDrawingMode(B_OP_OVER);
         else
             Menu()->SetDrawingMode(B_OP_BLEND); 
-        
+#endif      
         Menu()->DrawBitmapAsync(fDeviceIcon, where);
     }
 }