From 28c51cd5e875b853d2d09862e096915c36ca983c Mon Sep 17 00:00:00 2001
From: "ardi@ist-einmalig.de" <ardi@ist-einmalig.de>
Date: Tue, 5 May 2009 18:17:59 +0000
Subject: [PATCH]

---
 source/fonts/clock.ttf        | Bin 4436 -> 4884 bytes
 source/libwiigui/gui_text.cpp |  19 ++++++++++---------
 source/menu.cpp               |  11 +++++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/source/fonts/clock.ttf b/source/fonts/clock.ttf
index d3c73b1df00c128702c455b1a679fb888c0409a5..c7215cc6f4331ea56da242e96a2d040434827c79 100644
GIT binary patch
delta 993
zcmYjPO=uHQ5T5ro$<|HnkKM3>v8HC*U8>e-iHXvp)PG%@QbVORqOrCO(%4u_Ne_~O
z2qF^2cu~{}Dtho%EIm}HMf|y_hn}P$qF@pAWF-gf`t2r)yE`*)zS%e5x3h0{^|iVT
zF(N9XQ4;7_<ly>^ZQl;xCt?Yp9c|l<Xsni<Bw99yd{cKap5hxF=ZSa)Y`A-P$QPIS
zV<N{V)T?__eaUl;GZEw$kjs7jBfW35&m%<60Fm@8(Gx%Mu4Zx)wXascM4~4Xcf4l@
zK&S#x6Um{pcSu-=d>VOc|3G(q<<yE+G;koVPsY<Jy35?C??LW66;JleoZjD0RQ>~k
zZlngz4AEZt0Kr#K-<KNfNxfJ)>w%z~$oJSEiw`b4^dNS$ylH_bBg~^f<MnmrR(xI;
zkw`Sh*o5FiDiF6&T-YS|%rF)UBvL7xuv-;s1z%+&GOZy?D%4O3Z6gV*G~Kol#s=9H
zauVlL{34Lch`F<@f$h#cVm?kUbFW!L1_VAfNir-<mq4c2n+4kwd5gsT5NG{5FX-A3
zD{x!y_^6iFQUh(F7TRr^{~>__VtzEgn4is0=B)X~d{yj**NRteEAObXXYm)IDy){}
z9&*iH`46iYf6510&T!l;b-Z<Q=MHDP^El=>@912TaX^Ki-Qw4wNF+C*9TS5g0j7ys
zh*_3Mr|+cGn?vC++X=`0)5Ft?``~_s!=c}EaMsXe^C!E<pQ9huihd3IgP}$RE05w4
z@pzC0wV+=^WcQ4`p{hncqw9H>q^gn&p;On77%hg8SJk|s>#nGLRaLLbQ5RNOT{j>x
zTqIGbhUyDMp~hecWS}cH2b&fY{WfE;3NQo|D0Mw5DV!@(6tv*q<w`~+)+tF{Qq<J~
z%B&n)&IKiA(?Q1fs4FW+Saxw#&a#M{bz!IshwcN7QkV4)LzvHKQ*(25b90kjQ_L|O
sqIMh|QbbHZNe4D;2*BC{0UF;{_JlJzw^*^tT>|~JRA~)7=dBF?0rhgqdH?_b

delta 539
zcmXX@Pe>GD9DTp<TSbL-Oh@g{T0`tgh}u#hvPdixAtbp_grShbwmQU4PPNE(kQF2d
z4;6eJBC2C_=(Z)I9>PO)>a?fWTZcT@Ej>gqzS-@Ancw%`o8SBW9`j<LcBTRW5XTBM
z=BBQnJD>YK^AQk_?9JSz$s4mNxeFXk5Rc}4H;|XQmHIzGUCS?(9M@K#fY^KLr{;qN
zfAzx76!9dny-<8KAMbvgA>IYrr@exE=g08cXKH(VMm?`kabtUuqhXRn((_B@zFD<N
z9DOuiT+F-iE1iF7@Qv8<-Ex38(nftE!uMRiuyg-vkqNR~=vA=zu!J_e13K%}v%!Nx
z@byTohy8QJ6OFJ8yfw62zio~00~O89fa>6Y71b{(XA5?CAnV#8)KC%2!zS&7W4!!<
z4O`Y5R!yz>wi=9uv+RnF;v!je@K(m#1|#xRo}&dyZL2jh&sfc}j7Y|O5J$;|`7R?D
zDKrg$#Q!0e$wa>?ff((9R#xEv2bnM=c90Ik@Ml<qm?br126eCbrIOXOo)(kVDf1-u
mx|(je)n47Vw$<q<Y1FRK%`83WMIVmgI8NXsNA#O|*VrNHL}=Ln

diff --git a/source/libwiigui/gui_text.cpp b/source/libwiigui/gui_text.cpp
index fd9314b2..4a934d83 100644
--- a/source/libwiigui/gui_text.cpp
+++ b/source/libwiigui/gui_text.cpp
@@ -29,7 +29,7 @@ GuiText::GuiText(const char * t, int s, GXColor c)
 	alpha = c.a;
 	style = FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE;
 	maxWidth = 0;
-	font = 0;
+	font = NULL;
 
 	alignmentHor = ALIGN_CENTRE;
 	alignmentVert = ALIGN_MIDDLE;
@@ -49,6 +49,7 @@ GuiText::GuiText(const char * t)
 	alpha = presetColor.a;
 	style = presetStyle;
 	maxWidth = presetMaxWidth;
+	font = NULL;
 
 	alignmentHor = presetAlignmentHor;
 	alignmentVert = presetAlignmentVert;
@@ -168,8 +169,8 @@ void GuiText::Draw()
 
 	if(newSize != currentSize)
 	{
-		fontSystem->changeSize(newSize);
-		//(font ? font : fontSystem)->changeSize(newSize);
+		//fontSystem->changeSize(newSize);
+		(font ? font : fontSystem)->changeSize(newSize);
 		currentSize = newSize;
 	}
 
@@ -199,8 +200,8 @@ void GuiText::Draw()
 
 			if(text[ch] == ' ' || ch == strlen-1)
 			{
-				//if((font ? font : fontSystem)->getWidth(tmptext[linenum]) >= maxWidth)
-				if(fontSystem->getWidth(tmptext[linenum]) >= maxWidth)
+				if((font ? font : fontSystem)->getWidth(tmptext[linenum]) >= maxWidth)
+				//if(fontSystem->getWidth(tmptext[linenum]) >= maxWidth)
 				{
 					if(lastSpace >= 0)
 					{
@@ -231,15 +232,15 @@ void GuiText::Draw()
 
 		for(i=0; i < linenum; i++)
 		{
-			//(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
-			fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
+			(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
+			//fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
 			delete tmptext[i];
 		}
 	}
 	else
 	{
-		//(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
-		fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
+		(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
+		//fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
 	}
 	this->UpdateEffects();
 }
diff --git a/source/menu.cpp b/source/menu.cpp
index 551be485..12918fbc 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1411,8 +1411,10 @@ ShowProgress (s32 done, s32 total)
 
 	sprintf(prozent, "%0.2f%%", percent);
     prTxt.SetText(prozent);
+	prTxt.SetFont(fontClock);
     sprintf(timet,"Time left: %d:%02d:%02d",h,m,s);
     timeTxt.SetText(timet);
+//	timeTxt.SetFont(fontClock);
 	progressbarImg.SetTile(100*progressDone/progressTotal);
 
 }
@@ -1607,10 +1609,11 @@ ProgressDownloadWindow(int choice2)
 
 
 
-    sprintf(prozent, "%i%%", 100*i/cntMissFiles);
-    prTxt.SetText(prozent);
-    progressbarImg.SetTile(100*i/cntMissFiles);
-
+	sprintf(prozent, "%i%%", 100*i/cntMissFiles);
+	prTxt.SetText(prozent);
+	prTxt.SetFont(fontClock);
+	progressbarImg.SetTile(100*i/cntMissFiles);
+ 
     sprintf(msg, "%i file(s) left", cntMissFiles - i);
     msgTxt.SetText(msg);
     sprintf(msg2, "%s", missingFiles[i]);