Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* don't mess so much with the drawing and blending mode when 

drawing icons, most importantly, don't switch from compositing
  to pixel alpha, this fixes the drag bitmap generation, now
  it looks beautiful


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18846 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-09-14 18:13:11 +00:00
parent ebe10933dd
commit 358b3c8e76
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/kits/tracker/IconCache.cpp
View File

@ -1508,9 +1508,13 @@ SharedCacheEntry::Draw(BView* view, BPoint where, IconDrawMode mode, icon_size s
BBitmap* bitmap = IconForMode(mode, size);
ASSERT(bitmap);
drawing_mode oldMode = view->DrawingMode();
if (bitmap->ColorSpace() == B_RGBA32) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
if (oldMode != B_OP_ALPHA) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
}
} else {
view->SetDrawingMode(B_OP_OVER);
}
@ -1519,6 +1523,8 @@ SharedCacheEntry::Draw(BView* view, BPoint where, IconDrawMode mode, icon_size s
view->DrawBitmapAsync(bitmap, where);
else
view->DrawBitmap(bitmap, where);
view->SetDrawingMode(oldMode);
}
@ -1530,13 +1536,13 @@ SharedCacheEntry::Draw(BView *view, BPoint where, IconDrawMode mode, icon_size s
if (!bitmap)
return;
if (bitmap->ColorSpace() == B_RGBA32) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
} else {
view->SetDrawingMode(B_OP_OVER);
}
// if (bitmap->ColorSpace() == B_RGBA32) {
// view->SetDrawingMode(B_OP_ALPHA);
// view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
// } else {
// view->SetDrawingMode(B_OP_OVER);
// }
//
(blitFunc)(view, where, bitmap, passThruState);
}
@ -1617,9 +1623,13 @@ NodeCacheEntry::Draw(BView *view, BPoint where, IconDrawMode mode, icon_size siz
if (!bitmap)
return;
drawing_mode oldMode = view->DrawingMode();
if (bitmap->ColorSpace() == B_RGBA32) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
if (oldMode != B_OP_ALPHA) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
}
} else {
view->SetDrawingMode(B_OP_OVER);
}
@ -1630,6 +1640,8 @@ NodeCacheEntry::Draw(BView *view, BPoint where, IconDrawMode mode, icon_size siz
view->DrawBitmapAsync(bitmap, where);
} else
view->DrawBitmap(bitmap, where);
view->SetDrawingMode(oldMode);
}
@ -1641,12 +1653,12 @@ NodeCacheEntry::Draw(BView *view, BPoint where, IconDrawMode mode, icon_size siz
if (!bitmap)
return;
if (bitmap->ColorSpace() == B_RGBA32) {
view->SetDrawingMode(B_OP_ALPHA);
view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
} else {
view->SetDrawingMode(B_OP_OVER);
}
// if (bitmap->ColorSpace() == B_RGBA32) {
// view->SetDrawingMode(B_OP_ALPHA);
// view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
// } else {
// view->SetDrawingMode(B_OP_OVER);
// }
(blitFunc)(view, where, bitmap, passThruState);
}