Ticket #7220: Shortcuts.diff

src/preferences/shortcuts/clv/ColumnListView.cpp

@@ -85 +85 @@
 fPageWidth(0),
 fPageHeight(0),
 fSortKeyList(6),
-fRightArrow(BRect(0.0,0.0,10.0,10.0),B_COLOR_8_BIT,CLVRightArrowData,false,false),
-fDownArrow(BRect(0.0,0.0,10.0,10.0),B_COLOR_8_BIT,CLVDownArrowData,false,false),
+fRightArrow(BRect(0.0,0.0,10.0,10.0),B_RGBA32,CLVRightArrowData,false,false),
+fDownArrow(BRect(0.0,0.0,10.0,10.0),B_RGBA32,CLVDownArrowData,false,false),
 fFullItemList(32),
 _selectedColumn(-1),
 _editMessage(NULL)

src/preferences/shortcuts/ShortcutsSpec.cpp

@@ -51 +51 @@
 
 
 #define ICON_BITMAP_RECT BRect(0.0f, 0.0f, 15.0f, 15.0f)
-#define ICON_BITMAP_SPACE B_COLOR_8_BIT
+#define ICON_BITMAP_SPACE B_RGBA32
 
 
 // Returns the (pos)'th char in the string, or '\0' if (pos) if off the end of
@@ -441 +441 @@
 
         bitmapRegion.Include(item_column_rect);
         owner->ConstrainClippingRegion(&bitmapRegion);
-        owner->SetDrawingMode(B_OP_OVER);
+        owner->SetDrawingMode(B_OP_ALPHA);
 
         if ((fCommand != NULL) && (fCommand[0] == '*'))
             owner->DrawBitmap(sActuatorBitmaps[fBitmapValid ? 1 : 0],