From 9c921617d6116c28984e9b5081ac7fc8225b5d69 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 8 Sep 2013 16:56:43 +0000
Subject: [PATCH] ide,CtrlCore: Large icons

git-svn-id: svn://ultimatepp.org/upp/trunk@6322 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CodeEditor/Highlight.cpp |   6 ++++--
 uppsrc/CtrlCore/X11Top.cpp      |  11 +++++------
 uppsrc/CtrlCore/X11Top.h        |  18 ++++++++++--------
 uppsrc/ide/icon.ico             | Bin 2862 -> 2862 bytes
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/uppsrc/CodeEditor/Highlight.cpp b/uppsrc/CodeEditor/Highlight.cpp
index a3a5bae6b..2af89ee8b 100644
--- a/uppsrc/CodeEditor/Highlight.cpp
+++ b/uppsrc/CodeEditor/Highlight.cpp
@@ -248,7 +248,7 @@ int CodeEditor::InitUpp(const char **q)
 void CodeEditor::InitKeywords()
 {
 	static const char *cpp[] = {
-		"namespace", "__asm", "else", "struct",
+		"namespace", "asm", "__asm", "else", "struct",
 		"enum", "switch", "auto", "__except", "template",
 		"explicit", "this",
 		"bool", "extern", "mutable", "thread",
@@ -270,7 +270,9 @@ void CodeEditor::InitKeywords()
 		"double", "__leave", "static_cast",
 		"dynamic_cast", "long", "__stdcall", "while",
 		"force_inline",
-		// C++11
+		"and", "bitor", "or", "xor", 
+		"compl", "bitand", "and_eq", "or_eq",
+		"xor_eq", "not", "not_eq",
 		"char16_t", "char32_t", "constexpr", "decltype",
 		"noexcept", "nullptr", "static_assert",
 		"override", "final",
diff --git a/uppsrc/CtrlCore/X11Top.cpp b/uppsrc/CtrlCore/X11Top.cpp
index 4e5d63834..c46986905 100644
--- a/uppsrc/CtrlCore/X11Top.cpp
+++ b/uppsrc/CtrlCore/X11Top.cpp
@@ -192,14 +192,14 @@ void TopWindow::SyncCaption()
 		Ctrl *owner = GetOwner();
 		wm_hints->window_group = owner ? owner->GetWindow() : w;
 		if(!icon.IsEmpty()) {
-			Size isz = largeicon.IsEmpty() ? icon.GetSize() : largeicon.GetSize();
+			Size isz = icon.GetSize();
 			int len = 2 + isz.cx * isz.cy;
 			Buffer<unsigned long> data(len);
 			unsigned long *t = data;
 			*t++ = isz.cx;
 			*t++ = isz.cy;
 			for(int y = 0; y < isz.cy; y++) {
-				const RGBA *q = largeicon.IsEmpty() ? icon[y] : largeicon[y];
+				const RGBA *q = icon[y];
 				for(int x = isz.cx; x--;) {
 					*t++ = ((dword)q->a << 24) |
 					       (dword)q->b | ((dword)q->g << 8) | ((dword)q->r << 16);
@@ -238,9 +238,8 @@ void TopWindow::CenterRect(Ctrl *owner)
 		else
 			r = wr;
 		Point p = r.CenterPos(sz);
-		
-		if (p.x + sz.cx <= wr.Width() && p.y + sz.cy <= wr.Height()) {
-			r = RectC(p.x, p.y, sz.cx, sz.cy);
+		r = RectC(p.x, p.y, sz.cx, sz.cy);
+		if (p.x <= wr.Width() && p.y <= wr.Height()) {
 			wr.left += fm.left;
 			wr.right -= fm.right;
 			wr.top += fm.top;
@@ -253,8 +252,8 @@ void TopWindow::CenterRect(Ctrl *owner)
 				r.bottom = wr.bottom;
 			minsize.cx = min(minsize.cx, r.GetWidth());
 			minsize.cy = min(minsize.cy, r.GetHeight());
-			SetRect(r);
 		}
+		SetRect(r);
 	}
 }
 
diff --git a/uppsrc/CtrlCore/X11Top.h b/uppsrc/CtrlCore/X11Top.h
index ca72c1800..5751ec1a0 100644
--- a/uppsrc/CtrlCore/X11Top.h
+++ b/uppsrc/CtrlCore/X11Top.h
@@ -7,15 +7,17 @@ private:
 	XClassHint *class_hint;
 	Size        xminsize, xmaxsize;
 	bool        topmost;
+	
+	Buffer<unsigned long>  PreperIcon(const Image& icon, int& len);
+	
+	void                   CenterRect(Ctrl *owner);
+	void                   DefSyncTitle();
+	void                   EndIgnoreTakeFocus();
 
-	void          CenterRect(Ctrl *owner);
-	void          DefSyncTitle();
-	void          EndIgnoreTakeFocus();
+	void                   SyncState();
 
-	void          SyncState();
+	Image                  invert;
+	WString                title2;
 
-	Image         invert;
-	WString       title2;
-
-	static  Rect      windowFrameMargin;
+	static  Rect           windowFrameMargin;
 //$ };
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index 4cff9502574c41f1a9581c6a4b36e1faac662d5c..70287e90bfdc966832b79b084b534582aabb297e 100644
GIT binary patch
literal 2862
zcmchZOKTHR6vuC7CX>O1jZ0SsH`ZO+)Y^)VL0YjsaBR&&MF<Eg;vy?uIv}Duqp?jR
zsQC!_2qU<0<*4=jAnp{W5Z&lP81K3NGm~VRmOzUa?)>imyzaSo$Pgh?LKoSrP~(yz
z#JF6=IxWN_X^Zr5N(gh45W^HBXHL$PdJ197xc@jpxmR+owS6)+l!nmrJT(WXrQ%%I
z4QWz5<wrG0cl-J@64H<vn3PK^uA%mqmZ)|jU+t%2WPHT9T9+;IF(uT9&)IX{PB*G%
z<Ri)~n$cJ_Uq-2O$iSW$(ou5K7uQFote|4o%;$PhUm$KU&hHb`)dKYy-x$|PXz5?&
z{;5v?e0qgcm(DvtzAD1;xChEbKKbIi>FykB?iqJQ`%!GCM#rvtS(%@-tf-d^*a%H0
z`@2mDPwz}uenXP8+fQrCq1@i@jHOz#Wqxv4nj!AoxFxL65KB*=2}=t_MivOAJ(M=O
z^44`B8jlYtHb(=+9Md^`QR&K)n_vxbt>R^+?LtklF@w15^PNfy;|lz9i1SUvl}^In
zItw~QFvoPhO{+ZrJ6Kr;^FOh_^9O7(J+|k6!=C#EmZrGx2k5uWy8RH^wa{OF`Gnff
z{Q-)vU}a2Gc4rhUjj)~o{h{ON)4}<~89q0k&z^&JXPJCnaSFP94zy2$Wv0V%?IY;l
zKL)mrf{jQYgm(BG&Ssn^JH+?SY_h+Sfj!5%Jc;*VkMsLG0J@`KYXWpwdn3@z{a|A+
znC18Hu)VSe_R2oyZm_uvwDVy3)110Lo9Q#%*RVV9z~)D=^#yFdVEqylZ$WPfbU7~n
z8M?$Qzk+UaeES1*mhCpv;r&WcU8esA@gCQ6xxegt*vm|xDY$;ahu>#bxPM#BsPi|N
zA_blN{jOIBgAG&H<3K%?3QSWEB-F6d=^$g8L7FugGZ_=kAkgIqv`mH;WP{dvbz0LR
zzsgIewJ1NJ`i7iQeWi^qZCQbC7=hJkQPwiz{52OF`<=xfIj_%48RR?LCoMMBSB`}O
z*{WL>&fncyuP+vB7v?4F_1aZ>77F*SRb_<a4sd=uv0k5_rRQStev#rOrxkBkrxqv4
NQyrscVyyR`{sD5Eq1^xg

literal 2862
zcmeHJF;2uV5ZuJEV^P5iKr~#5bcmV)cmUG90D-6}pgoBKI)1=gQqa)z93(Tdj-8yj
zLnnbK(5<vt@9xZa<2zXqsl>?kwy51SBF9+e+={%Qmhwp@;<iL4#K8C9l|DsIfcrxW
z*sJvKwlA>(h0t}K`Wjk_o6qNgPCWTZgZa3(WRO4uBRaWU^%}ZADoMNG>wby>KE<py
zs-<2Z5!CW~F1+tBjcTSIBUtogEBQd_djPnAVV=lkFY8Ap6cqa{zt>B1#TZX8^Os;o
zBXG`qV!ck0qrc+(sk5BVpOCtI-!=Fu(&OVfkQ@2z<+B-29@qWM@vOKXv4h4?*IB;u
z%gPtM67U;2-|S;oq%(uhafg&X?sH8Jxr_IV*O5-ZFU{ADJU={&4~@LPzKO4cv=9iW
z2h@1v=eJiI-<-kbKkyI#1Lb|NB6kLNOK+yC#5p4fYTjCDofA8{UfR}WxB<6rTVaGD
zAg>p5Ti2<tJZtO37wR|gq_251%DorUG~$O5p|$2W)$iW3anml3J}iEE&kjm?<)&Pk
z9d}vbi_*{9YpWll?H%jWX?<^iKs<=i?lX$m3qJj<nGuh8rt!&~`a^ci5ub(q^qf8c
D{>`r*