CtrlLib: StatusBar minor fix

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

uppsrc/CtrlLib/StatusBar.cpp

@@ -289,7 +289,7 @@ void ProgressInfo::Refresh()
 	if(!info) return;
 	String txt = Format(~text, pos);
 	info->Set(tabi, txt, tw ? tw : GetTextSize(txt, StdFont()).cx + 8);
-	info->Set(tabi + 1, PaintRect(ProgressDisplay(), 1000.0 * pos / total), cx);
+	info->Set(tabi + 1, PaintRect(ProgressDisplay(), 1000.0 * pos / (total ? total : 1000)), cx);
 }
 
 ProgressInfo& ProgressInfo::Set(int _pos, int _total)

uppsrc/CtrlLib/StatusBar.h

@@ -4,7 +4,6 @@ public:
 	virtual void FrameLayout(Rect& r);
 
 private:
-
 	struct Tab {
 		PaintRect             info;
 		int                   width;

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

@@ -19,9 +19,7 @@ rameLR][@(0.0.255)3 <][_^Ctrl^3 Ctrl][@(0.0.255)3 >][3 _]&]
 [s0; &]
 [s2; 
 @@image:643&143
-€<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>薯樗ｸﾊ龕ｶ､弦ｧｶｩﾘｭ
+(A2cAFwAAAOn/AAAAAHic7dXNCYAwDAVgJ3YPR3ADD+I8riB0hwoeBJO2pjZtI7zwDhJKfz6pumN3CNIq6zIj6XjvOVr3F2c8QAMa0MwGaDXQhqtIhw8gzcLwOSUdI2h8S3znicGfxcizpGMELbaZ2mixteSdvmjBK9AGLXj1LIi9oklwYrZadNbEVNCqHuGe046YIpriEdKf/e5iaTSX8+vX3RVZZXhWsGMHDQEa0ID2r3A0jxIUuEpqnDYkNye2qVgt)
 &]
 [s0; &]
 [s9; InfoCtrl is a simple static Ctrl that represents information 
@@ -53,7 +51,8 @@ t]_[*@3 tab], [@(0.0.255) const]_[_^Value^ Value][@(0.0.255) `&]_[*@3 info],
 [s2; Sets (creates if needed) the section of the InfoCtrl.&]
 [s7; [%-*C@3 tab]-|Index of section.&]
 [s7; [%-*C@3 info]-|Content of section. Value content is converted to 
-the text using AsString.&]
+the text using AsString, unless it is Image, which is displayed 
+as is.&]
 [s7; [%-*C@3 width]-|Width of section in pixels. Negative value indicates 
 that section should be placed given number of pixels from the 
 right border of the InfoCtrl.&]
@@ -126,12 +125,7 @@ nfoCtrl]&]
 [s0; &]
 [s2; 
 @@image:1268&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>
+(A8sAFQAAAOv/AAAAAHic7Zk9jsMgEEZ9/xtsGaXZYstEylG22CbpVuIOThHJIgzzEzAMWB96RWRbBr48YJSE/98AQBvWdXUfw1D8fH8BmY+cgWBUMPcxDA4EqwGCqUCwGiCYCgSrAYKpuAu2LIt7CMVAMJUawZaoFQ/gMIJlo0iu1MdlyZD20qhfC5WCcXMsDmcuNsGyUdDvvcWsqUvJ50b9GmkhmGUFJbufbwjFZI9IOiM5rnq4t8lj6INFsNvlfLuc6MPqsuUmONoqK4YKFueQLKvOgsmHdTesgl3zgslbE5e2YOZEdgUimNdRZd+pxtzBtse4Hcyya6lRzy6YWnF1E0x4+bCCZR82HpH2qOeyKzBFvj2Hvfh0gfeEE2yru4KtBgvvjgnnJnfFZfqVxIIJc6Q57DgGIVhhJN2QBLueXne5GmxfprMr4IdWA4Iz8a1sDbYvEOyQuP9VNDUQTCV2Jlt3Bb4GAxBMJRXsve7qWYPNyIpmaMYwH/c/75GiHb89Ac30xxw=)
 &]
 [s0; &]
 [s9; StatusBar is a Frame Ctrl intended to be used as informational 
@@ -291,4 +285,4 @@ by Total method.&]
 [s5;:ProgressInfo`:`:operator int`(`):%- [* operator_int]()&]
 [s7; [*/ Return value]-|Get().&]
 [s3; &]
-[s0; ]
+[s0; ]]