[Igarden-commit] Garden/source/LayoutDB TextBox.cpp, 1.16.2.6, 1.16.2.7

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

Update of /cvsroot/igarden/Garden/source/LayoutDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23644/source/LayoutDB

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

Index: TextBox.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/TextBox.cpp,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -C2 -d -r1.16.2.6 -r1.16.2.7
*** TextBox.cpp	26 Mar 2008 22:21:38 -0000	1.16.2.6
--- TextBox.cpp	9 May 2008 01:08:26 -0000	1.16.2.7
***************
*** 443,446 ****
--- 443,448 ----
  	planLength_t	top, left, bottom, right;
  	double			scale, spacing, radius, out;
+ 	borderType_t	btype;
+ 	planLength_t	minSize;
  	
  	top = _rectangle.yOffset+_rectangle.ySize;
***************
*** 471,475 ****
  	view->SetLineColorToDefault();
  	view->SetGLColor();
! 	switch(_borderType)
  	{
  	case kBorderPlain:
--- 473,484 ----
  	view->SetLineColorToDefault();
  	view->SetGLColor();
! 	
! 	minSize = MinimumSize(view, kBorderRounded);
! 	if(_rectangle.xSize > minSize && _rectangle.ySize > minSize)
! 		btype = _borderType;
! 	else
! 		btype = kBorderPlain;
! 	
! 	switch(btype)
  	{
  	case kBorderPlain: