Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 00:29:41 +02:00
Code Issues Releases Wiki Activity

Fix 'black spot' issue on buttons.

Browse Source 
100% transparent black was appearing as black.  Now it appears as the background colour.
AButton backgrounds now support alpha channel, which they did not before.
This commit is contained in:
James Crook 2017-06-16 15:38:48 +01:00
parent b24560a134
commit b293ad0b50
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ImageManipulation.cpp
View File

@ -26,6 +26,8 @@ channel. This collection of functions fills that gap.
#include "Audacity.h"
#include "ImageManipulation.h"
#include "AllThemeResources.h"
#include "Theme.h"
/// This looks at the first pixel in the image, and shifts
/// the entire image by the vector difference between that
@ -210,6 +212,25 @@ std::unique_ptr<wxImage> OverlayImage(teBmps eBack, teBmps eForeground,
unsigned char *dst = dstImage->GetData();
memcpy(dst, bg, bgWidth * bgHeight * 3);
// If background image has tranparency, then we want to blend with the
// current backgorund colour.
if( imgBack.HasAlpha() ){
unsigned char *pAlpha = imgBack.GetAlpha();
wxColour c = theTheme.Colour( clrMedium );
unsigned char onePixImage[3];
// GetData() guarantees RGB order [wxWidgets does the ocnversion]
onePixImage[ 0 ] = c.Red();
onePixImage[ 1 ] = c.Green();
onePixImage[ 2 ] = c.Blue();
for( int i=0;i< bgWidth*bgHeight;i++){
unsigned char * pPix = &dst[ 3*i];
float alpha = 1.0 - (pAlpha[i]/255.0);
pPix[0] = pPix[0] + alpha *( (int)onePixImage[0]-(int)pPix[0]);
pPix[1] = pPix[1] + alpha *( (int)onePixImage[1]-(int)pPix[1]);
pPix[2] = pPix[2] + alpha *( (int)onePixImage[2]-(int)pPix[2]);
}
}
// Go through the foreground image bit by bit and mask it on to the
// background, at an offset of xoff,yoff.
// BUT...Don't go beyond the size of the background image,