[Igarden-commit] CommonSource/YAAFExtensions RGHypertext.cpp, 1.24.2.3, 1.24.2.4

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/YAAFExtensions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20933

Modified Files:
      Tag: Release_branch_v1
	RGHypertext.cpp 
Log Message:
Fix issue where text color could discolor an image (reset fore color)

Index: RGHypertext.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.cpp,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -d -r1.24.2.3 -r1.24.2.4
*** RGHypertext.cpp	11 Jan 2007 01:34:07 -0000	1.24.2.3
--- RGHypertext.cpp	7 Feb 2007 14:17:34 -0000	1.24.2.4
***************
*** 547,556 ****
  		for(n = 0; n < count; n++)
  		{
  			str = _entries[n].text.c_str();
  						
  			font = new XGFont();
! 			font->SetFontName(_entries[n].info.fontName);
! 			font->SetFontFlags(_entries[n].info.fontFlags);
! 			font->SetFontSize(_entries[n].info.fontSize * (_scaleByPercent)/100);
  			SetForeColor(_entries[n].color);
  			SetFontObject(font);
--- 547,559 ----
  		for(n = 0; n < count; n++)
  		{
+ 			fontInfo_t	info;
+ 			
  			str = _entries[n].text.c_str();
  						
  			font = new XGFont();
! 			info = _entries[n].info;
! 			font->SetFontName(info.fontName);
! 			font->SetFontFlags(info.fontFlags);
! 			font->SetFontSize(info.fontSize * (_scaleByPercent)/100);
  			SetForeColor(_entries[n].color);
  			SetFontObject(font);
***************
*** 558,561 ****
--- 561,566 ----
  			DrawString(str, strlen(str));
  			
+ 			SetForeColor(KXGColorBlack);
+ 			
  			font->Release();
  		}
***************
*** 602,605 ****
--- 607,611 ----
  	//<a href='/randomfriend.phtml?user=minkeymnky'><b><font size=1>minkeymnky</b></a>
  	
+ 	HandleWord(" ", 1);
  	pos = GetPenPos();
  	pos.v += _lineHeight*NextLineDirection()*GetScale();
***************
*** 630,633 ****
--- 636,640 ----
  	PRECONDITION(_inAnchor);
  
+ 	_x += 3;
  	endPos = GetPenPos();
  	endPos.v = endPos.v + (_lineHeight*NextLineDirection()*GetScale());