yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't know if these masking fixes are necessary anymore now that QPixmap

Browse source 
is 'fixed' - but they don't do any harm, so they go in anyway.

svn path=/trunk/kdebase/kwin/; revision=114434
This commit is contained in:
Rik Hemsley 2001-09-16 09:26:29 +00:00
parent 2b5294278b
commit b5c7e843fe
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/riscos/Button.cpp
View file

@ -127,6 +127,11 @@ Button::setPixmap(const QPixmap & p)
aPixmap_.convertFromImage(aTx); aPixmap_.convertFromImage(aTx);
iPixmap_.convertFromImage(iTx); iPixmap_.convertFromImage(iTx);
if (0 != p.mask())
{
aPixmap_.setMask(*p.mask());
iPixmap_.setMask(*p.mask());
}
} }
repaint(); repaint();

7
clients/riscos/Static.cpp
View file

@ -198,8 +198,9 @@ Static::_createTexture(QPixmap & px, int t, bool active)
QColor c(options->color(Options::ColorType(t), active)); QColor c(options->color(Options::ColorType(t), active));
QRgb light(c.light(110).rgb()); QRgb mid (c.rgb());
QRgb dark (c.dark(110).rgb()); QRgb light (c.light(110).rgb());
QRgb dark (c.dark(110).rgb());
QRgb * data(reinterpret_cast<QRgb *>(texture.bits())); QRgb * data(reinterpret_cast<QRgb *>(texture.bits()));
@ -208,6 +209,8 @@ Static::_createTexture(QPixmap & px, int t, bool active)
data[x] = light; data[x] = light;
else if (data[x] == b) else if (data[x] == b)
data[x] = dark; data[x] = dark;
else
data[x] = mid;
px.convertFromImage(texture); px.convertFromImage(texture);
} }