From 67cbfd68eed16d765626d52271af0cedb250cd2b Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 13 Jan 2014 08:30:54 +0000
Subject: [PATCH] ide: designer issue #613

git-svn-id: svn://ultimatepp.org/upp/trunk@6765 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Draw/SImageDraw.cpp |   4 +++-
 uppsrc/ide/icon.ico        | Bin 2862 -> 2862 bytes
 uppsrc/ide/idebar.cpp      |   8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/uppsrc/Draw/SImageDraw.cpp b/uppsrc/Draw/SImageDraw.cpp
index 259f5a293..c279f4aa7 100644
--- a/uppsrc/Draw/SImageDraw.cpp
+++ b/uppsrc/Draw/SImageDraw.cpp
@@ -33,10 +33,10 @@ SImageDraw::operator Image() const
 {
 	ImageBuffer b(ib.GetSize());
 	memcpy(b, ib.Begin(), sizeof(RGBA) * ib.GetLength());
-	const RGBA *s = alpha.ib.Begin();
 	RGBA *t = b;
 	const RGBA *e = b.End();;
 	if(has_alpha) {
+		const RGBA *s = alpha.ib.Begin();
 		while(t < e) {
 			t->a = s->r;
 			t++;
@@ -57,11 +57,13 @@ SImageDraw::operator Image() const
 
 SImageDraw::SImageDraw(Size sz)
 {
+	has_alpha = false;
 	SImageDraw1::Create(sz);
 }
 
 SImageDraw::SImageDraw(int cx, int cy)
 {
+	has_alpha = false;
 	SImageDraw1::Create(Size(cx, cy));
 }
 
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index e0ea0587cf9f3450aabb5798ed49cd6a087d9894..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
zcmcguTZ>y&6#jB@<#?g(gCc?xM6lqz=%}b5G^VixX3~&JtoX7glb%jvPv@kQOygrf
zr1~JD<Fu2PQho6Uh!0YbJouparv3m0U!=ufpd7!o_qpZFg#n8TzO(kad~2`0_Q{z6
zGRWe@323>T177ATvh%=g`a=731}NCTX~`kVL`FY>GtB!R#phmW9JPHq*Qdju&1M?M
zsHO8JlZh{oeBp;R#7@QzXv7yG!$7#Q3To*6=?QD6_<BE`!~9T3)e^oi7HBFh(K+YN
z8+W5?hB47(2|_uP&n$foCeG!E9g@?rsJ>ycg3djXAJhx`GTKZq;vbNcXhHgnCKl95
z*^D1Df2ngYU#?K<%6X5$*F}PSGY8=szQm&0Bs(|jpl35H*-vug8nIvZvY(&!?5mef
zco4Rn?C%9&mW?stHzbW@T-L%7?)-PAq+2>eep*Ua4xhY#10_F)U%&qmCCf*V1$_E_
z`efwIdd#X;mhncV8aY(8h5AbKa9j1@^xQbEE@3$8!3|s&>J2Q{DhRiDv(k!kWzk?P
zDYKf3b=Scu?OcFTeYpM2C`G9%+GlH64m{-_?!)1lV=>QjF2-Cv9@uKNjoRC7ZOLQ8
z`olpNj|Fk*Z?)EnW*~O6{#KMP`zJ*y52J)b;@)=bk^PdQR_5m?=Wm^l=Ud_M8|`=|
zci5lYNz}g@p+Ai08Qw>;6L9X`)%oGP*2tGgXqRbkcCSX~4f(3sL5+DzT}00v@(xYc
zjmipEn-$bl2XgDb{dE_=^Y7Y89bUjQ4*{<e7l;9IgZPs8j`)SRPvBwTN#Z4<Nw~xZ
z#BJgm;wRz{;veGFBfxV+g?NX!MtnqkL3~U6O#De$j{;8-uMr*M8u2ml6|ug(q3>XO
zv<R!N;5uC>-tm?01{TW})MW>Q#WLz@9o~3od>1{VT@Rj)4f&ppP`2v0J{+JQ*7AmY
zUtElI&KO%)%pP60r*kvp-@zKzy6<9h=;6It8?QKK?Yv-ex4bc&Ewgskx6Qs+`{?s`
zGjxo<zsdKUdp)oBIfuH|RWw%5qo&s@hS%t#ztM#k)Ef*u_A0*s`7Zd#Qp^1ph_4Cz
zcv8q_qr_|`V;2fpn@US5pSO#Jf}Ia+aTbdO6SVCt#kPt?S%}Zr*1Vm!tT3*5`MeeK
zZK<Cl!us0ICG1kk&gOD<DQ=OqauNT?1xNA#zq95axf$o0mg9V9)10I|-7hzn#J6+u
zX7AG{rqjL7txLPq)9J12@?2W_Y`nt^>SvAKeOmN%y4#ZHUgz_U<WtwQ{&45)-m4PX
Mc~PDz`LA>O7w)QhJOBUy

diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 49d47f3bb..a041da940 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -374,14 +374,14 @@ void Ide::FilePropertiesMenu(Bar& menu)
 	menu.MenuSeparator();
 	menu.Add(IsActiveFile(), AK_FILEPROPERTIES, THISBACK(FileProperties))
 		.Help("File properties stored in package");
-	menu.Add(IsActiveFile(), AK_SAVEENCODING, THISBACK(ChangeCharset))
+	menu.Add(IsActiveFile() && !designer, AK_SAVEENCODING, THISBACK(ChangeCharset))
 	    .Help("Convert actual file to different encoding");
-	menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
+	menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
 	    .Help("Show differences between the project and arbitrary files");
-	menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
+	menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
 	    .Help("Show differences with patch file applied");
 	if(IsSvnDir(GetFileFolder(editfile)))
-		menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
+		menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
 		    .Help("Show svn history of file");
 }