From 5fe81868fbeb1dc5231efe0ddaca7e4edc563c02 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 15 Nov 2013 14:41:34 +0000
Subject: [PATCH] ide: Fixed color issue in icondes

git-svn-id: svn://ultimatepp.org/upp/trunk@6556 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/IconDes/Fast.cpp |  30 ++++++++++++++----------------
 uppsrc/ide/icon.ico     | Bin 2862 -> 2862 bytes
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/uppsrc/IconDes/Fast.cpp b/uppsrc/IconDes/Fast.cpp
index 7d2638b9d..9395b59de 100644
--- a/uppsrc/IconDes/Fast.cpp
+++ b/uppsrc/IconDes/Fast.cpp
@@ -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);
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index 78c33273821ca5fdf32dcbe5092a137fc3600226..ed674dab4681e8f6a8a54a9f03063eb6fa681734 100644
GIT binary patch
literal 2862
zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK
z%r~>MyIv<z;G!F8c6NTgZ)eBRDntd9ba6o<?<%6_ybJyVq8}VH|GFTm9}-=ohV_!Q
zkd>(Ax_gv?&&u`C@p<jQfuZkv(IdE|ZnatsP}Bo&9PrcJjz$IuBUFLK&U48595L<;
zFXu@O*P9J&Nz8KIvJnaQ9Njl|Bb=6lWfat8FP^L99$Yx8fp6eE7x)#)3{ra#@A<4R
zwK~Co-%*pafIh>-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF
zh;iv<iq9hxzP#WRK5q8s2~l50UGW=|YnsO%7+}ZmOd~C|jL)SxtLV$ePt*(*{r>rj
znzMn<nPA}fz%d<pjxv9I%B6%`OWu#=yZ+M`oYZq*=!t(3tVeK3-HP}%V?{mi#sNRg
zv7ZZOYmgBhK`xe@ac5wkw>q@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E
z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU>
z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S
zYulOO9r!C&;}^e5{HAebRk<d%$Xr#xAKYN(r+a7hk6gcF+IM?riMpxW%n@5Zx_R^U
zao24Zw{JIWyYBWq*7^L~hc#EQeX4eI1>1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W
F{sOt@+Oq%v

literal 2862
zcmcguO>Y`k6g_+t5UX_ARiD_@U0^w(vJ)dqF)+|k#y}Wwq-Z3B0n?Gji~}Y~cb2+n
zcU9{;F`NDt7Tt8;pHpdi@0(A?B(j{SPkM9b-gnNqA0wUs5=h~}1IYD58rY?`!2bgH
zlVZNVl>jn%V2d%d1?_}<0#6C|KQ4!I#rMb3$FU9toYiV2_Z_q(?(*`|;mvsF`x@*=
z&o&g|@FIr0nagjUhRjb9UpvN^`6Pz$z75nOG5^f7WaJ9^T<bTiMr!(JY>CC&UmxTX
zO7=m(H4OVcIer%CyG&A$*pKo(J-;s3x)Tie8!(X)xXxf=o=(iC^AF6QbvE<)6S6M%
zdk4N0@$l{(nCtTSESOESa`)Y<*_{>VV{E7q#$_$H`SHjty*S`=_}tmQUjwUDxG(7r
ziSOt+zcYuq>-S7fmh_bP@s&%a@#{}NBj=>?&tHEdmvoRN0f*ua#dzeRP(Z$>px5Z5
zS#RM$6i_JVp;UV4S2T2A3c@@@IbTDi*MO!ran!0o90=?b%BU$7H2N)c)fRMdfI_hq
z^6MHJI`hLEYV(=QQO<XuDTh${6{y{pVO~vvuJpmU7S$Eh<Hg%u6-}vG#3NCJUL@^~
z0_9LgUsp+Qy%teyph$Ig6b*;Eg1UC-))|R$Pu!2+cSGrTHMY_Hp6jo|Fxs#uGn|P!
ztnnOMZy)1Z!+<%QVQ!y79Gh4SEa(>tn6|+7j)AIu279^(Lmi=9-G|YhVKN&))J=@%
z0&gGhlI{_PGaL5l1&+-*2A06ZVgy?}!4ByUImfh&eX=uqg29=9X^q!-dhHqcFEAb1
zm=kVqdk03vl>IcT8hxYt_i#KkpiYNajK-+$8)#Flv%wkarX_O){p&T?pN{ZmZs7Ia
zHr1qJXe}@<^ZXVtTIZPRI*Kn$lpb+kq3(j}p3Gkn&Wvz2&-_RIIpL0=Ki6o+Q;dff
zn29QOw;#eVr?6;#{4LeWr}eFwC->-C!-?PT`2?>l1D2=5J)V!J(6u7<UZNf>oKUPP
z@%QM}a=)?vThUt8;CJa>pYa=Eqn}C9-QulOB7saM1u}Bw=!(c@GH@c-OE#Mc;3?uJ
zvstjEMTY$3y6+^D{<-8iPSWSo)#M<}S5hQjIvw$IIi%8Q<iZk3>yH1aNcS_|vu@H=
zP<r@smwPru-+o)(UhhgAyZZ9o@VBp)%bVW&(`&NJ<@?wCER}wLb43WU-?;X=z;?O3
f?(p-b_eYQMWEE+DxvJef;ghTH_!(QDI;Z~trY*z@