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

The color key is now correct for other modes than B_RGB32 as well.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17320 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-05-04 14:53:05 +00:00
parent fe19cff624
commit 458c9bfb2f
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/servers/app/drawing/AccelerantHWInterface.cpp
View File

@ -811,14 +811,32 @@ AccelerantHWInterface::UpdateOverlay(Overlay* overlay)
// TODO: for now, this should be done somewhere else, ideally
rgb_color colorKey = overlay->Color().GetColor32();
window.red.value = colorKey.red;
window.green.value = colorKey.green;
window.blue.value = colorKey.blue;
window.alpha.value = colorKey.alpha;
window.red.mask = 0xff;
window.green.mask = 0xff;
window.blue.mask = 0xff;
window.alpha.mask = 0xff;
uint8 colorShift = 0, greenShift = 0, alphaShift = 0;
switch (fDisplayMode.space) {
case B_CMAP8:
colorKey.red = 0xff;
colorKey.green = 0xff;
colorKey.blue = 0xff;
colorKey.alpha = 0xff;
break;
case B_RGB15:
greenShift = colorShift = 3;
alphaShift = 7;
break;
case B_RGB16:
colorShift = 3;
greenShift = 2;
alphaShift = 8;
break;
}
window.red.value = colorKey.red >> colorShift;
window.green.value = colorKey.green >> greenShift;
window.blue.value = colorKey.blue >> colorShift;
window.alpha.value = colorKey.alpha >> alphaShift;
window.red.mask = 0xff >> colorShift;
window.green.mask = 0xff >> greenShift;
window.blue.mask = 0xff >> colorShift;
window.alpha.mask = 0xff >> alphaShift;
// TODO: we need the 'uint32 options' from BView::SetViewOverlay() here
// for now using commonly used settings (should be 'safe')
window.flags =