mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-21 06:45:39 -06:00
ide: Fixed color issue in icondes
git-svn-id: svn://ultimatepp.org/upp/trunk@6556 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
89ad87667f
commit
5fe81868fb
2 changed files with 14 additions and 16 deletions
|
|
@ -46,24 +46,22 @@ void IconDes::ApplyImage(Image m, dword flags, bool alpha)
|
|||
cc.a = d->r;
|
||||
AlphaBlendStraight(&c, &cc, 1);
|
||||
}
|
||||
else
|
||||
if(d->r == 255) {
|
||||
if(flags & K_ALT)
|
||||
c.a = cc.a;
|
||||
else
|
||||
if(flags & K_CTRL) {
|
||||
RGBA h = cc;
|
||||
h.a = c.a;
|
||||
c = h;
|
||||
}
|
||||
else {
|
||||
c = cc;
|
||||
c.a = d->r;
|
||||
else {
|
||||
if(d->r == 255) {
|
||||
if(flags & K_ALT)
|
||||
c.a = cc.a;
|
||||
else
|
||||
if(flags & K_CTRL) {
|
||||
RGBA h = cc;
|
||||
h.a = c.a;
|
||||
c = h;
|
||||
}
|
||||
else
|
||||
c = cc;
|
||||
}
|
||||
if(d->r == 128)
|
||||
c.a = c.r = c.g = c.b = empty;
|
||||
}
|
||||
else
|
||||
if(d->r == 128)
|
||||
c.a = c.r = c.g = c.b = empty;
|
||||
if(c != *t && (doselection || k->r)) {
|
||||
*t = c;
|
||||
RefreshPixel(x, y);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue