AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed wxCreateGreyedImage() to respect the original image mask

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-04-02 21:34:29 +00:00
parent ba700b5c1a
commit 434c6c9fa0
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/common/tbarbase.cpp
View File

@ -35,8 +35,11 @@
#endif
#include "wx/frame.h"
#include "wx/image.h"
#include "wx/settings.h"
#if wxUSE_IMAGE
#include "wx/image.h"
#include "wx/settings.h"
#endif // wxUSE_IMAGE
#include "wx/toolbar.h"
@ -691,75 +694,73 @@ void wxToolBarBase::UpdateWindowUI(long flags)
}
}
// Helper function, used by wxCreateGreyedImage
static void wxGreyOutImage( const wxImage& src,
wxImage& dest,
const wxColour& darkCol,
const wxColour& lightCol,
const wxColour& bgCol )
{
// Second attempt, just making things monochrome
int width = src.GetWidth();
int height = src.GetHeight();
int redCur, greenCur, blueCur;
for ( int x = 0; x < width; x++ )
{
for ( int y = 1; y < height; y++ )
{
redCur = src.GetRed(x, y);
greenCur = src.GetGreen(x, y);
blueCur = src.GetBlue(x, y);
// Change light things to the background colour
if ( redCur >= (lightCol.Red() - 50) && greenCur >= (lightCol.Green() - 50) && blueCur >= (lightCol.Blue() - 50) )
{
dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
}
else if ( redCur == bgCol.Red() && greenCur == bgCol.Green() && blueCur == bgCol.Blue() )
{
// Leave the background colour as-is
// dest.SetRGB(x,y, bgCol.Red(), bgCol.Green(), bgCol.Blue());
}
else // if ( redCur <= darkCol.Red() && greenCur <= darkCol.Green() && blueCur <= darkCol.Blue() )
{
// Change dark things to really dark
dest.SetRGB(x,y, darkCol.Red(), darkCol.Green(), darkCol.Blue());
}
}
}
}
#if wxUSE_IMAGE
/*
* Make a greyed-out image suitable for disabled buttons.
* This code is adapted from wxNewBitmapButton in FL.
*/
bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
bool wxCreateGreyedImage(const wxImage& src, wxImage& dst)
{
out = in.Copy();
dst = src.Copy();
unsigned char r, g, b;
if ( in.HasMask() )
unsigned char rBg, gBg, bBg;
if ( src.HasMask() )
{
in.GetOrFindMaskColour(&r, &g, &b);
src.GetOrFindMaskColour(&rBg, &gBg, &bBg);
dst.SetMaskColour(rBg, gBg, bBg);
}
else // assuming the pixels along the edges are of the background color
{
r = in.GetRed(0, 0);
g = in.GetGreen(0, 0);
b = in.GetBlue(0, 0);
rBg = src.GetRed(0, 0);
gBg = src.GetGreen(0, 0);
bBg = src.GetBlue(0, 0);
}
wxColour bgCol(r, g, b);
const wxColour colBg(rBg, gBg, bBg);
wxColour darkCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
wxColour lightCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT) ;
const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
wxGreyOutImage(in, out, darkCol, lightCol, bgCol);
// Second attempt, just making things monochrome
const int width = src.GetWidth();
const int height = src.GetHeight();
for ( int x = 0; x < width; x++ )
{
for ( int y = 0; y < height; y++ )
{
const int r = src.GetRed(x, y);
const int g = src.GetGreen(x, y);
const int b = src.GetBlue(x, y);
if ( r == rBg && g == gBg && b == bBg )
{
// Leave the background colour as-is
continue;
}
// Change light things to the background colour
wxColour col;
if ( r >= (colLight.Red() - 50) &&
g >= (colLight.Green() - 50) &&
b >= (colLight.Blue() - 50) )
{
col = colBg;
}
else // Change dark things to really dark
{
col = colDark;
}
dst.SetRGB(x, y, col.Red(), col.Green(), col.Blue());
}
}
return true;
}
#endif // wxUSE_IMAGE
#endif // wxUSE_TOOLBAR