[Igarden-commit] CommonSource/YAAFExtensions RGHypertextGL.cpp, 1.7, 1.7.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	RGHypertextGL.cpp 
Log Message:
Textbox and titlebox fixes

Index: RGHypertextGL.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertextGL.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** RGHypertextGL.cpp	18 Dec 2005 02:12:12 -0000	1.7
--- RGHypertextGL.cpp	9 May 2008 01:08:15 -0000	1.7.2.1
***************
*** 91,101 ****
  long RGHypertextGL::StringWidth(const char *str, long len)
  {
! 	return static_cast<long>(_font->StringWidth(str, len));
  }
  
  void RGHypertextGL::DrawString(const char *str, long len)
  {
  	_font->DrawCountedString(_x, _y, 1.0, str, len);
! 	_x += _font->StringWidth(str, len)*GetScale();
  }
  
--- 91,109 ----
  long RGHypertextGL::StringWidth(const char *str, long len)
  {
! 	return static_cast<long>(_font->StringWidth(str, len)*GetScale());
  }
  
  void RGHypertextGL::DrawString(const char *str, long len)
  {
+ 	double width = _font->StringWidth(str, len)*GetScale();
+ 	
+ 	while((_x + width) > _bounds.right)
+ 	{
+ 		len--;
+ 		width = _font->StringWidth(str, len)*GetScale();
+ 	}
+ 	
  	_font->DrawCountedString(_x, _y, 1.0, str, len);
! 	_x += width;
  }
  
***************
*** 118,123 ****
  	
  	_drawRect = rect;
! 	
! 	
  	DrawLines(text,rect.left + 4,rect.top /*- (GetFontHeight()+4)*/,rect.right - 8);
  
--- 126,130 ----
  	
  	_drawRect = rect;
! 		
  	DrawLines(text,rect.left + 4,rect.top /*- (GetFontHeight()+4)*/,rect.right - 8);