CtrlLib: Switch forced layout options, fix in .usc (thanks Didier)

git-svn-id: svn://ultimatepp.org/upp/trunk@7833 f0d560ea-af0d-0410-9eb7-867de7ffcac7

uppsrc/CtrlLib/CtrlLib.usc

@@ -245,13 +245,13 @@ ctrl StaticText {
 
 	Paint(w) {
 		sz = ViewSize(w);
-		textsize = GetTextSize(.SetText, .SetFont);
+		textsize = GetSmartTextSize(.SetText, .SetFont);
 		px = 0;
 		if(.SetAlign == "ALIGN_CENTER")
 			px = (sz.cx - textsize.cx) / 2;
 		if(.SetAlign == "ALIGN_RIGHT")
 			px = sz.cx - textsize.cx;
-		w.DrawText(px, (sz.cy - textsize.cy) / 2, .SetText, .SetFont, .SetInk);
+		w.DrawSmartText(px, (sz.cy - textsize.cy) / 2, .SetText, .SetFont, .SetInk);
 	}
 	Sample() {
 		.SetText = "Text";

uppsrc/CtrlLib/PushCtrl.h

@@ -42,7 +42,7 @@ public:
 	Pusher&  SetLabel(const char *text);
 	Pusher&  ClickFocus(bool cf = true);
 	Pusher&  NoClickFocus()                                 { return ClickFocus(false); }
-	bool     IsClickFocus() const { return clickfocus; }
+	bool     IsClickFocus() const                           { return clickfocus; }
 	
 	Font     GetFont() const                                { return font; }
 	String   GetLabel() const                               { return label; }
@@ -295,6 +295,7 @@ private:
 	int          linecy;
 	int          light;
 	int          mincy;
+	int          direction;
 
 	int   GetIndex() const;
 	int   GetIndex(Point p);
@@ -331,6 +332,9 @@ public:
 	Switch& SetFont(Font f)                                     { font = f; Refresh(); return *this; }
 	Font    GetFont() const                                     { return font; }
 	Switch& MinCaseHeight(int cy)                               { mincy = cy; Refresh(); return *this; }
+	Switch& SetAutoDirection()                                  { direction = 0; return *this; }
+	Switch& SetHorizontal()                                     { direction = 1; return *this; }
+	Switch& SetVertical()                                       { direction = -1; return *this; }
 
 	Switch();
 	virtual ~Switch();

uppsrc/CtrlLib/Switch.cpp

@@ -159,6 +159,10 @@ void Switch::Paint(Draw& w) {
 	int y = 0;
 	int x = 0;
 	bool horz = linecy * cs.GetCount() > sz.cy;
+	
+	if (direction == 1) horz = true;
+	else if (direction == -1) horz = false;
+	
 	if(horz) {
 		posx.SetCount(cs.GetCount());
 		linecy = sz.cy;
@@ -308,6 +312,7 @@ void Switch::CancelMode() {
 }
 
 Switch::Switch() {
+	direction = 0;
 	linecy = 16;
 	mincy = 0;
 	Transparent();

uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp

@@ -146,6 +146,11 @@ lickFocus]([@(0.0.255) bool]_[*@3 cf]_`=_[@(0.0.255) true])&]
 lickFocus](false).&]
 [s3; &]
 [s4; &]
+[s5;:Pusher`:`:IsClickFocus`(`)const: [@(0.0.255) bool]_[* IsClickFocus]()_[@(0.0.255) cons
+t]&]
+[s2;%% Retrieves the value of ClickFocus.&]
+[s3; &]
+[s4; &]
 [s5;:Pusher`:`:GetFont`(`)const: [_^Font^ Font]_[* GetFont]()_[@(0.0.255) const]&]
 [s2;%% Returns the font that should be used in painting the concrete 
 derived Pusher class. Pusher itself does not use this font anywhere, 
@@ -166,4 +171,4 @@ onst]&]
 [s7;%% CTRL`_PRESSED-|pusher is enabled and pressed&]
 [s7;%% CTRL`_DISABLED-|pusher is disabled&]
 [s3; &]
-[s0; ]
+[s0; ]]

uppsrc/CtrlLib/src.tpp/Switch$en-us.tpp

@@ -18,34 +18,11 @@ rl]&]
 [s0; &]
 [s2; 
 @@image:1287&131
-ｃﾎ€斧€€<EFBFBD><EFBFBD>€€€€<EFBFBD>懦力<EFBFBD>ﾁﾆ佝<EFBFBD><EFBFBD><EFBFBD>茗箸､<EFBFBD>ｼэﾏｹｦ<EFBFBD>ﾔｼ<EFBFBD><EFBFBD>椄､ﾐﾀｹ靄隹<EFBFBD>ﾐﾀﾂ<EFBFBD>糟箍櫛ﾂﾃ囑･ｴ
-ｷﾁ蕉ﾘﾁ亥ｼ唾ｼ<EFBFBD><EFBFBD>ﾇﾙﾙ撈酩｣ｦ艷<EFBFBD>豼<EFBFBD><EFBFBD>釮ﾏﾌｻｯﾒ€ｮｩﾒﾒﾒﾒﾒ<EFBFBD>ﾒﾒﾒﾒﾓ･ﾔ<EFBFBD><EFBFBD>洄ﾛﾅﾅ<EFBFBD>ﾀﾜﾜ屶･璢ﾆﾆﾞｺ<EFBFBD><EFBFBD>
-ｦ€ｦ奕ｲｩﾈ戦鈐ｼ樅ｼ<EFBFBD>ﾌ･<EFBFBD>ﾗｷﾟ鴟ﾅ<EFBFBD>ﾇｷ冥ｰｵ<EFBFBD>ﾊ€逃奕ｲｩﾌｹｲ<EFBFBD>ｾﾈｾ<EFBFBD>｣ﾜｬｮﾗｫﾕﾚｭﾖ<EFBFBD>ﾗ寫ﾆ｡<EFBFBD>并ｱ<EFBFBD>ｭﾋ
-募篁ｳ肓懣€<EFBFBD>ｵｱﾉ＊ｲ蟠粫<EFBFBD>鄒頌ｽﾋｻы聚<EFBFBD>ﾘ字･酖蝪ﾛﾌｾﾘｾｽｶ嶇ﾖｫﾘ<EFBFBD>ﾗﾂﾑﾌ譚噬酎ﾊ€ﾐﾒ沍瘁ﾘﾟ<EFBFBD>
-象悶皃ﾏ來ﾅ<EFBFBD><EFBFBD>ｯ<EFBFBD>ｨ顗<EFBFBD>ﾎ莅褪<EFBFBD><EFBFBD>｢ﾕ菴<EFBFBD>ﾝ楫⊥杦ﾑ<EFBFBD>ｾｵ<EFBFBD>蕫酔ﾎ砕Κ<EFBFBD>屡ﾄ赶怙ｸ鯉ｴｨｸ<EFBFBD>刻<EFBFBD>
-｡ﾘﾐ鰯埓｡紗ﾜﾕﾝ幻ｻ<EFBFBD>椄<EFBFBD>､｢<EFBFBD>ﾑ<EFBFBD><EFBFBD><EFBFBD>ｭ榻ｧ突ﾝｬｯﾁ<EFBFBD><EFBFBD>嵯ﾂ釥ﾍｯ<EFBFBD>€ﾃ<EFBFBD>ﾁ<EFBFBD>ｰ蟆€聖ｿﾍ渚<EFBFBD>ﾜ<EFBFBD><EFBFBD>ﾊ⊥ﾅ
-ｸ蜈ﾃｑｩ､<EFBFBD>襁樛朋ﾆﾃ｢ｸ迢ﾙ<EFBFBD>讙ﾍﾖ<EFBFBD>ｭﾍﾚ槃耶ﾅ﨧葩ｬ末癒ｶ♂ｦ髯ｱｴ€隴ﾐ<EFBFBD>勢髙牴ぺｱ整魑<EFBFBD>ﾋ鴪<EFBFBD>
-ﾉﾕ楠≦ﾒﾙｲｺ込ｴﾓ<EFBFBD>ﾉ<EFBFBD><EFBFBD>靱ﾀｬﾙ<EFBFBD>ｪ｢隱ｶﾗ<EFBFBD>ｽｳ溽帆者<EFBFBD>ﾎﾏ<EFBFBD><EFBFBD><EFBFBD>菠匈ﾘｴ€<EFBFBD>閥ﾀｱ茶ﾐ厠｣ﾄｹ蕀ﾄ恃粒ﾌ
-ﾇ阿ｲ<EFBFBD><EFBFBD>忠ﾏ<EFBFBD><EFBFBD>楴笊ｴｪ狆ｼｽﾄ<EFBFBD>ﾄ裵屎ﾞ<EFBFBD>氓ｳﾟ<EFBFBD>餧<EFBFBD>援ﾟｱｸ嵯蠻閠<EFBFBD>ｸ哿€ｭ墳<EFBFBD>ﾇ<EFBFBD>ｩﾜ髴ﾔ<EFBFBD>渙ﾝ酘鰄
-€宅<EFBFBD>擲ﾚﾘ呆ｾｷ沂<EFBFBD>ぜ宦ｳﾒ<EFBFBD>競鉗<EFBFBD>ｹｩ･€琲η杏ﾀ尊碯ｪ趨ﾓ<EFBFBD>ﾓｸｨｨｾﾃｱｪﾇ<EFBFBD>麿岔竿ﾟ髙待<EFBFBD>靱<EFBFBD>ｩ
-ｹ釛ﾙ夏罅<EFBFBD>ﾈﾋﾈﾒ｣浙ぬ･ﾀ€ャｹ€ﾉ矜＊乖ｵﾛｬ<EFBFBD>霏糂ﾓ郤ﾃｺ呪据鑅ﾉﾅ竍€槃雀ｱﾚ菩<EFBFBD>｢ｸ聆ﾅｮ<EFBFBD>ﾊｲ<EFBFBD>ｸ
-ｳﾀ空寺ｲ堰応<EFBFBD>ｦ<EFBFBD>ｮ器肭俗玩<EFBFBD>｢ｸ瞳ﾀｻ昌髷賻ﾎ€愼ｱ戟ﾓ<EFBFBD><EFBFBD>ﾎﾏﾍﾅ<EFBFBD>ﾄこ<EFBFBD>ﾊﾊﾊﾊ猝ﾊﾊﾊﾊ<EFBFBD>潟ｦ<EFBFBD>ｽ
-
+(A84AFQAAAOv/AAAAAHic7ZfNaxpBGMb9f3II5BSiJIdcvATPuaaHYFQ8BjEeJCTQQOhJaLCFtlBCckkRDGKw+cJDmhYlNMGP1FjBiGURQbz3wYVl2dmdHWdHo2SGh2Bmv377vs/Mu6/SLilSUlJSUlJSUlJTpVTq+/r628XFwNzcm6Wl4MbGXjp9+aoApppzMqlIbW4mPJ5gPJ5MpXJXVzfp9MX29ke3O7C1dfBKAKaaczKpTDl9vkg+/6NcLler1VqtVq/XG41GofAb87GYCa3L5WK5M+NpHADqzbUxyYEy5bRi5ngXvujxPUu7hONa7LpYDhrnQ+UhW8w+Pj02m81Wq3V3V8LRTOaaA5KRygBQH4xhAdhfnNuW4+EkTxhF9BwGjS+GKO7YdVXO5GVy9dtq6CLkPfYe3R61221FUXZ2PoVC+xyQjE7TA6iBag5GezCcADgM7yg4hTuNj2rYUAhxGr4hUdzV3Qw2O2meJP4kovfR+a/zrX+tTqeTy90sL4dZIA01QvtNL3B6AEOghgUwZTAAkL9ND42Ik1x9htpKBxZFZQVDgpGpJP9l9B5aFXxDorhnC1nsZqrN1n6tzR7PFuvFbrdbLJYWFvy2iSZpGTE0AC1QaqwQqO5gMAJYMZCuswUWy2nwktUTbYEFUtk6jR400/Vi6zR0xGhVwFl9qqJoqjbz5r0zn2eUjtLr9c7Pf7JsKWRIGTE0AH2UtECxA9AZTKNEOXlEnBQXscyIorJ1Gn2Sz2l+/x46YrQq4Dy8PUTRxG4Gm53en4Kz3+/v7n4Jh9+xOI3lRegAhvU4FIAtla3/x8Ap3GkcVHSf0F3nxGlYEW53AB0xWhVwPrefC/WCupuBs1L5i6NnZ3mxOaUAYOgDxQjAkbhhcyqQU6DTOKgoPrGqR3RsFpupikbf+3wRdMRoVfANqedcWYnE4x/IS8jSo5+0SqVAAAMDOUlhYAEWGCjbLOsx6MBi02c6Q7qO9Bh7ZknFYgceTxAdMVoVfEOiuGPXxXKwyrJwvTjAi3MOm7IJiR4HdiZzHQrt4+sRrQr+oriTtUC7ueme5lBOAEQxjIHTdAd2zs9Nxf3EMYddSkpKSkpKSkpKiP4DpnWuPQ==)
 &]
 [s2; 
 @@image:406&312
-€γ€ｲ€€€π<EFBFBD>€€€€<EFBFBD>懦ﾙﾏﾋ崔ｮ佻<EFBFBD>翆<EFBFBD>ﾜｪ橳昼<EFBFBD>専薯ｵ茯宙ｽ<EFBFBD>ｨﾐｼ<EFBFBD>ﾚﾒﾂﾛｨ｢鱗ﾋ<EFBFBD>｢態ﾟ萋瑙ﾙﾅﾔﾌﾖ
-<EFBFBD>浯ﾝｬﾋｨ檮<EFBFBD>ｭ小ﾝ纐<EFBFBD>ｱﾎ讒ﾙｷ<EFBFBD><EFBFBD>嶇＇<EFBFBD>ｷﾟ<EFBFBD>ｼ曙<EFBFBD>掠舌<EFBFBD>萩滓譫障庄訣ｽ尨ｮﾘ悄ﾟｬ偏<EFBFBD>酣唱･<EFBFBD>
-<EFBFBD>ﾘ箘ﾗｨ<EFBFBD>ｫｧｧ逾ﾒ<EFBFBD>ﾚﾚ嶝ﾑ<EFBFBD>ｵ勉濯｣菫<EFBFBD>ｽﾜｭ<EFBFBD>ｮﾕ<EFBFBD>瓦ｴ嚶ﾕﾎﾕ嶇ｦ､ﾝ癲<EFBFBD>ｪ所ﾄ｢<EFBFBD><EFBFBD>遐<EFBFBD>石<EFBFBD>崛ﾚ暝<EFBFBD>
-檐圜鮗<EFBFBD><EFBFBD><EFBFBD>ﾏ庶ﾎｼ<EFBFBD>凋ｴ｣斧<EFBFBD>ﾇ<EFBFBD>ｸ<EFBFBD>ﾝ<EFBFBD>ﾘ揉皰ｯｿﾊﾍｧﾟﾄﾙれｪ煉<EFBFBD>ｷ<EFBFBD>ﾜ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ｾｪ宝ﾉﾉ跨ﾗｓｹﾋ謝<EFBFBD>
-ﾜ<EFBFBD>･癩逝<EFBFBD>ｺﾁ<EFBFBD>ﾚ<EFBFBD><EFBFBD>晟<EFBFBD>渤｡ﾋｷ爛｣ｩﾊ迦ｩｷ<EFBFBD>ﾃ<EFBFBD>ﾐｿﾍﾑ<EFBFBD>懴<EFBFBD>屹<EFBFBD>ｻﾝｾｺ咊€ｴ均ﾎ<EFBFBD>鉢ﾇ科･ｶﾑｿｭﾑ<EFBFBD>ｼ<EFBFBD><EFBFBD>ﾎ
-<EFBFBD>ｳｱ<EFBFBD>遁槙亭帷ｧ･ﾒ<EFBFBD>泝<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ｫ<EFBFBD>戛<EFBFBD><EFBFBD><EFBFBD><EFBFBD>叝､<EFBFBD>ﾗ届ｾﾄ<EFBFBD>ﾇ<EFBFBD>ｪﾄ<EFBFBD>ﾁ<EFBFBD>ｺ<EFBFBD><EFBFBD>ｭ銓ｯｽｷｺ裾鏡褌ｺ
-ｵ贔ﾎ役<EFBFBD>ﾕ<EFBFBD>ﾇ<EFBFBD>ﾄ<EFBFBD>ﾁ<EFBFBD>ｶ｢<EFBFBD>汰袷ｯｫ<EFBFBD>ﾘぱｯ<EFBFBD>蕚ｮ叝ﾞ<EFBFBD>巫<EFBFBD>ﾅ箭癆活ﾄ<EFBFBD>ｯﾄ<EFBFBD>ｿﾗｿ煕<EFBFBD>犱ﾛ陵ｯ熏ｽﾚ麺ｴ<EFBFBD>｡
-ﾔ検ｾ凋<EFBFBD>｡ｬ<EFBFBD>傚ｸ得夷ｧ<EFBFBD>ｻ僚割ｿ崇鍾岡ﾎｿ€<EFBFBD>﨨ﾞﾑ<EFBFBD>ﾛｾ﨟<EFBFBD>ﾄｰﾌ<EFBFBD>萓ﾞ燧芹<EFBFBD>ﾏ釚椏磊<EFBFBD>ﾔ堡<EFBFBD><EFBFBD>ｳﾟ<EFBFBD>
-ﾀ<EFBFBD><EFBFBD>ﾕ儒ｼ倶<EFBFBD>ｮ罌ｳﾉ┃<EFBFBD>鱗ﾁｰ<EFBFBD><EFBFBD>ｯ<EFBFBD><EFBFBD>ｬ<EFBFBD>ﾉ<EFBFBD>珎€樰ｲ<EFBFBD>ゃ鋠鯒<EFBFBD>ﾄｺ<EFBFBD>ﾗﾂ<EFBFBD>ｶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>め｢<EFBFBD><EFBFBD>ｯ廻ｪ
-憔<EFBFBD>矣<EFBFBD>ﾒﾌ･ｫ<EFBFBD><EFBFBD>｡<EFBFBD>ﾄｲﾙ<EFBFBD>ゃ斎圜憚ｷﾐ<EFBFBD>訂<EFBFBD><EFBFBD>梵ﾏ<EFBFBD>ﾈ賦<EFBFBD>ﾚ｡<EFBFBD>蕈咢ﾒ猟ｴ卆<EFBFBD>恢<EFBFBD>｡ﾌ浄壁ﾀｼｿ澄歌
-襠灸ｬ患ﾀ<EFBFBD>ｽｦ｣ﾌ<EFBFBD>ま<EFBFBD>釤ﾌ聟<EFBFBD><EFBFBD>艱<EFBFBD>ｯ<EFBFBD>鉛莚ｰ峵ｯ<EFBFBD>た完<EFBFBD>錦ｦ痛萠領<EFBFBD>ﾈ睫瞼<EFBFBD>螳卍弍<EFBFBD><EFBFBD>ﾞﾀ
-ｱ€<EFBFBD>€<EFBFBD>諱<EFBFBD>
+(A0EAMgAAAM7/AAAAAHic7VnPSxtBGM3/40HwJCp68JKLePZqDxI15CgSPQRRqFA8BVrSQlsoohdLICKR1F/kYG3ZRVRM1sZtYF0sSygNge6tjyxdlv0xTman2YXO8AibzW7y3jff9+28jPn7lykQYxSLn+bmno+PLwwNPZuYWJyf3yyVTiJnRY+lpfzY2GIuVygWK6en56XS8dram9HRhZWVV5Fzo+Q/Pb1crX6u1WqKojQaDVVVm82mJF3h/Oqqj4pEIkF422cgfxB/m7/aHXf3d5qm6bp+eXmLTw8OzrwSnLSjlYD8R/44+Wvd8dgdhmGsr79Np1/EWQLqF/kP/jf1Gxd//YfearUqlfPJyYxXgpO5S45ToH0l4ZqQQP9B/Vr5r/0dFv+f3SHLtyMjKUoJ3qnxlcN3+tA/0X+c8Qd5m3+73T46+hI0C09OB0EUx4lIpTbRP9F/vPEH/06ns7HxPpPZCpLgG+cnJXDJHxuYAvR/9E/0H6sEnPzr9e/49PCw+o8k8JKTzb5E/0f/RP9B/Tr5T00t53KvvbcQngu+5ew65lvOFvD8Qv9H/0T/Qf0i/5E/iL8v/9gCzy/0f1Qu+g9ekf/e/HHFkHthCgjEAcIvRM6/V79ghuvtfNuXyy9gvVqWyzR+IQwfvhKcfqFwUpj5OJM+Tid3kzsXOwS/EJIPXwlOvwD+e9pe/ls+e50d/jBM8AtkPt4cC1p1eM/7HpNh+4WyVEb8Lf6zX2cHdwdlVQ7yC2T+ruOgM4QrfZdYQbD9gnKvIH8s/slqcuDdgNEygvwC4fvpRfFaxDr9wvbFNvIH8Qf//et9gl8g/AQvCfQqXH7h4fFBUiUr/pR+IfJEMln9AmGNGqacXbdQ5pL5//mFnpDwjMiVCgiQIfxC5PwZ9hfCNBm+fYl5fyHMj/KVwLy/EB8JzPsLhCwKs8DwPSYjzP6Cb0j7v8xj218gZIXvqq9XCZTkLbDtL/RBAr0KLvsL0SaSyeQXTOL/SGHK2XULZS6Zwi9wAvOzXkCAAX8A/IJmnw==)
 &]
 [s9; Options can be visually aligned horizontally or vertically `- 
 U`+`+ choses alignment based on size of options and Ctrl rectangle. 
@@ -203,7 +180,21 @@ onst]_[_^Value^ Value][@(0.0.255) `&]_[*@3 v])&]
 [s7; [%-*C@3 f]-|Font to be used.&]
 [s7; [*/ Return value]-|`*this for chaining.&]
 [s3; &]
-[s0; &]
+[s4;%- &]
+[s5;:Switch`:`:SetAutoDirection`(`):%- [_^Switch^ Switch][@(0.0.255) `&]_[* SetAutoDirectio
+n]()&]
+[s2; Sets Switch layout to automatic mode, where items are layed 
+out depending on the available area for switch (vertically is 
+the are is high enough, horizontally otherwise).&]
+[s3;%- &]
+[s4;%- &]
+[s5;:Switch`:`:SetHorizontal`(`):%- [_^Switch^ Switch][@(0.0.255) `&]_[* SetHorizontal]()&]
+[s2; Forces horizontal layout.&]
+[s3;%- &]
+[s4;%- &]
+[s5;:Switch`:`:SetVertical`(`):%- [_^Switch^ Switch][@(0.0.255) `&]_[* SetVertical]()&]
+[s2; Forces vertical layout.&]
+[s3; &]
 [s0; &]
 [s0;%- &]
 [ {{10000@3 [s0; [*@(229)4 Switch`::Case]]}}&]
@@ -218,7 +209,7 @@ witch`::GetCases] method.&]
 [s3;%- &]
 [s5;:Switch`:`:Case`:`:label:%- [_^String^ String]_[* label]&]
 [s2; Text of the case.&]
-[s3; &]
+[s3;%- &]
 [s4;%- &]
 [s5;:Switch`:`:Case`:`:value:%- [_^Value^ Value]_[* value]&]
 [s2; Value of the case.&]
@@ -231,4 +222,4 @@ witch`::GetCases] method.&]
 [s5;:Switch`:`:Case`:`:enabled:%- [@(0.0.255) bool]_[* enabled]&]
 [s2; Enable flag.&]
 [s3; &]
-[s0; ]
+[s0; ]]