From 1410f380dbd6f371ec155eb506d7979652cd6505 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 24 Feb 2009 14:02:05 +0000
Subject: [PATCH] Minor Painter and ide fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@901 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Painter/Fillers.cpp |  40 ++++++++-----------------------------
 uppsrc/Painter/Fillers.h   |   2 --
 uppsrc/ide/Abbr.cpp        |  14 +++++++------
 uppsrc/ide/icon.ico        | Bin 2862 -> 2862 bytes
 4 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/uppsrc/Painter/Fillers.cpp b/uppsrc/Painter/Fillers.cpp
index 338cd8198..55a1c7c09 100644
--- a/uppsrc/Painter/Fillers.cpp
+++ b/uppsrc/Painter/Fillers.cpp
@@ -84,36 +84,6 @@ void SubpixelFiller::Start(int minx, int maxx)
 	}
 }
 
-inline
-void SubpixelFiller::Render1(int val)
-{
-	int16 *w = v;
-	int h = val / 9;
-	int h2 = h + h;
-	w[-2] += h;
-	w[-1] += h2;
-	w[0] += val - h2 - h2 - h2;
-	w[1] += h2;
-	w[2] += h;
-	w[3] = 0;
-	v++;
-}
-
-void SubpixelFiller::Render2(int val)
-{
-	int16 *w = v;
-	int h = val / 9;
-	int h2 = h + h;
-	w[-2] += h;
-	w[-1] += h2 + h;
-	w[0] += val - h2 - h2 - h2 + h2;
-	w[1] += h2 + val - h2 - h2 - h2;
-	w[2] += h + h2;
-	w[3] = h;
-	w[4] = 0;
-	v += 2;
-}
-
 void SubpixelFiller::Render(int val)
 {
 	int16 *w = v;
@@ -232,8 +202,14 @@ void SubpixelFiller::Render(int val, int len)
 				while(t < e)
 					AlphaBlend(*t++, ss ? Mul8(*s++, alpha) : color);
 		else
-			while(t < e)
-				AlphaBlendCover8(*t++, ss ? Mul8(*s++, alpha) : color, val);
+			if(ss)
+				while(t < e)
+					AlphaBlendCover8(*t++, Mul8(*s++, alpha), val);
+			else {
+				RGBA c = Mul8(color, val);
+				while(t < e)
+					AlphaBlend(*t++, c);
+			}
 		v = begin = sbuffer + 3;
 		v[0] = h + h + h;
 		v[1] = h;
diff --git a/uppsrc/Painter/Fillers.h b/uppsrc/Painter/Fillers.h
index 43fc96bed..b08c3a9d0 100644
--- a/uppsrc/Painter/Fillers.h
+++ b/uppsrc/Painter/Fillers.h
@@ -36,8 +36,6 @@ struct SubpixelFiller : Rasterizer::Filler {
 
 	void Write(int len);
 	void RenderN(int val, int h, int n);
-	void Render2(int val);
-	void Render1(int val);
 
 	void Start(int minx, int maxx);
 	void Render(int val);	
diff --git a/uppsrc/ide/Abbr.cpp b/uppsrc/ide/Abbr.cpp
index 94dc5212f..464c72c3f 100644
--- a/uppsrc/ide/Abbr.cpp
+++ b/uppsrc/ide/Abbr.cpp
@@ -38,9 +38,10 @@ void AbbreviationsDlg::Finish(const String& s)
 void AbbreviationsDlg::Add()
 {
 	String s;
-	EditText(s, "New abbreviation", "Keyword", CharFilterAlpha);
-	abbr.Add(s, Null);
-	Finish(s);
+	if(EditText(s, "New abbreviation", "Keyword", CharFilterAlpha)) {
+		abbr.Add(s, Null);
+		Finish(s);
+	}
 }
 
 void AbbreviationsDlg::Remove()
@@ -55,9 +56,10 @@ void AbbreviationsDlg::Edit()
 	if(!abbr.IsCursor())
 		return;
 	String s = abbr.GetKey();
-	EditText(s, "Edit keyword", "Keyword", CharFilterAlpha);
-	abbr.Set(0, s);
-	Finish(s);
+	if(EditText(s, "Edit keyword", "Keyword", CharFilterAlpha)) {
+		abbr.Set(0, s);
+		Finish(s);
+	}
 }
 
 AbbreviationsDlg::AbbreviationsDlg()
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index 6c896bbddb9def2fc765b1783529a4fc5f4c4fb0..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

delta 1227
zcmb7;4@{JG7{@>N$K9dpm_&dl&D0FVij~O`f1+%fGD=_?<(7ni8ZA-Np)BqdH_&jR
zcMfgs6lNoc4T7*~5Z8er=E^I&_u6D3L;jcuMc@>?ySMj_Keg6cJ=^#9Jm2s8e4p=I
z8&n%qcS|i?)9DGXSjVc>OL<J+#-6%j)JFm+*m0DWie(JNKf;jiAfGLHooh8Z@|y3`
z+t-ZS*g=oqbsn~sG29$MK%qaD%x?*bTF&pG8j9N%@ldggjYZjfQ<*~Y(QTZm&p@@i
z3&9z~)#WwR#}5i*?2?GKJIP6x*q+^vRQEjt{+&4Yp5wlGlnKv8^p-Z_lde<hiD5ML
zCV9FVPLJ0UmOqc~#}oLjD1eDWs|idgrE7=4iJ&abH_7*g?lX426_@86oAN*6Q0gc(
z>8A(|UeD9_I@$1|aD|qZk6HM_CW>CF=C&ahU8#!&l{+a;vT`Kc$c4rPz6hO1T9_4c
zR3%zR4ki1)V%Th;vp15Mty^&~p3j#CGiFa8J<bt+(GSyTNab>AA-j!v{P=4E+Kfi}
z4{zhuTsM~9ICT9L=mlc~<5Cf)0!Jw*dy1Y<&eETz;Dhov`E+;%@7@kWG?<7Yf$|gu
z&)NoQZ}^RZ%mAX5vsu~Y$6jR_(N)`dZ8!vF^+w)#`6RYN=(d=6vP?r(c@v3otvuIp
zhlRCvl&wKb+-oP&)P`Uep2xqwijoo~H{?S}QN<kYRuC%$bF)1IqsfV=_7HM8ld-G>
ztPj4y;IVd$Z>?i|=K~~Nn!}y_8g6uLrq5hKcU%W&gYR-+?geJ;i^X#F2|6N1IMW}2
zbD*0X*H3i5?O~DL&6TtR0`?I<Hq;%YtEUO;+*H1fOJvJ?kCMJ+73+^#n7_tNVr2`T
z=l;N&ODj2^<G|UmfMtto*b`EL#SqD@*g0HW`ZKOjJIUE@vZ{(e5RhajB#C{qVC~6#
zq+Rc`c5DUZALfHROOh}kKjAX$G9;wx>dEe%{|R0bQ{_8QF7J8$Q~T5Ysqh(nn*ZJZ
zj92)-FeOI_;(sfLN;R{nQYb`+LnX@1S6Z7*)HocXZHjwEjm9zgQ502jiAs&eJ9xE8
zuAJoFe4k)bDyJ8GMw?CP>)yv3pq4Qm;N$AQaIIEUsnw$P&wrF}sb~EEGRPq(HmhH0
J2%N1~`~d}|I3xf7