Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove manual bitmap greying code with a call to wxImage::ConvertToGreyscale()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-29 20:47:31 +00:00
parent f9e5b1c786
commit 10ab355cbd
1 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/univ/toolbar.cpp
View File

@@ -288,59 +288,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos),
void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
{
#if wxUSE_IMAGE
// created disabled-state bitmap on demand
if ( !enable && !tool->GetDisabledBitmap().Ok() )
{
wxImage image( tool->GetNormalBitmap().ConvertToImage() );
wxImage image(tool->GetNormalBitmap().ConvertToImage());
// TODO: don't hardcode 180
unsigned char bg_red = 180;
unsigned char bg_green = 180;
unsigned char bg_blue = 180;
unsigned char mask_red = image.GetMaskRed();
unsigned char mask_green = image.GetMaskGreen();
unsigned char mask_blue = image.GetMaskBlue();
bool has_mask = image.HasMask();
int x,y;
for (y = 0; y < image.GetHeight(); y++)
{
for (x = 0; x < image.GetWidth(); x++)
{
unsigned char red = image.GetRed(x,y);
unsigned char green = image.GetGreen(x,y);
unsigned char blue = image.GetBlue(x,y);
if (!has_mask || red != mask_red || green != mask_green || blue != mask_blue)
{
red = (unsigned char)((((wxInt32) red - bg_red) >> 1) + bg_red);
green = (unsigned char)((((wxInt32) green - bg_green) >> 1) + bg_green);
blue = (unsigned char)((((wxInt32) blue - bg_blue) >> 1) + bg_blue);
image.SetRGB( x, y, red, green, blue );
}
}
}
for (y = 0; y < image.GetHeight(); y++)
{
for (x = y % 2; x < image.GetWidth(); x += 2)
{
unsigned char red = image.GetRed(x,y);
unsigned char green = image.GetGreen(x,y);
unsigned char blue = image.GetBlue(x,y);
if (!has_mask || red != mask_red || green != mask_green || blue != mask_blue)
{
red = (unsigned char)((((wxInt32) red - bg_red) >> 1) + bg_red);
green = (unsigned char)((((wxInt32) green - bg_green) >> 1) + bg_green);
blue = (unsigned char)((((wxInt32) blue - bg_blue) >> 1) + bg_blue);
image.SetRGB( x, y, red, green, blue );
}
}
}
tool->SetDisabledBitmap(image);
tool->SetDisabledBitmap(image.ConvertToGreyscale());
}
#endif // wxUSE_IMAGE
RefreshTool(tool);
}