[Igarden-commit] CommonSource/YAAFExtensions RGTableView.cpp, 1.28.2.38, 1.28.2.39

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

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

Modified Files:
      Tag: Release_branch_v1
	RGTableView.cpp 
Log Message:
Clean up drawing of table without title header (was thick black line on top)

Index: RGTableView.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.cpp,v
retrieving revision 1.28.2.38
retrieving revision 1.28.2.39
diff -C2 -d -r1.28.2.38 -r1.28.2.39
*** RGTableView.cpp	16 Apr 2008 02:48:35 -0000	1.28.2.38
--- RGTableView.cpp	9 May 2008 13:10:09 -0000	1.28.2.39
***************
*** 1396,1479 ****
  	long	numColumns;
  	
! 	if(isPrinter)
! 		cr = r;
! 	else
! 		cr = GetContentRect();
! 	hdr = cr;
! 	hdr.bottom = _titleHeight;
! 	draw.ClipRect(&hdr);
! 	
! 	draw.SetFontObject(_font);
! 	len = _columnTitles.GetNumStrings();
! 	s = hdr;
! 	s.left -= x;
! 	rightEdge = s.left;
! 	numColumns = _colArray.Length();
! 	
! 	DrawHeaderButton(draw, s, kButtonSetup, isPrinter);
! 	for (i = 0; i < numColumns; i++)
  	{
! 		s.right = s.left + _colArray[i]->width;
  		
! 		if(_colArray[i]->visible && (!isPrinter || (s.right <= r.right)))
  		{
! 			if(isPrinter)
! 				draw.FillRect(s, kTableGreyColor);
! #if OPT_MACOS == 0
! 			else if(_colArray[i]->display)
! 				draw.FillRect(s, kTableReadOnlyColor);
! #endif
! 			else
! 			{
! 				DrawHeaderButton(draw, s, kButtonDrawStd, isPrinter);
! 			}
! 			rt = s;
! 			if(i >= 0 && i < len)
  			{
- 				_columnTitles.GetString(i,buf);
  				if(isPrinter)
  				{
! 					draw.SetForeColor(KXGColorBlack);
! 					draw.SetBackColor(KXGColorWhite);
  				}
! 				else if((i == _highlightCol) ||
! 						((i == _selCol) && (_selRow == -1)))
  				{
! 					DrawHeaderButton(draw, s, kButtonDrawSelected, isPrinter);
! 					if(_selectColIcon != 0)
! 						draw.DrawIcon(_selectColIcon, s.right-13, s.top+3, 10, 5);
  				}
- 				draw.MoveTo(hdr.left+3,hdr.top + draw.GetFontAscent());
- 				// Start 1/2 a font height down (mult *1.5)
  				
! 				Rect	rtText = rt;
! //				rtText.top += draw.GetFontAscent();
! 				rtText.top += (_titleHeight - RGTableCell::SizeWrappedText(draw, rt, buf))/2;
! 				RGTableCell::DrawWrappedText(draw,kCenterJust,rtText,buf);
  			}
- 			
- 			draw.SetForeColor(KXGColorBlack);
- 			rt.right++;
- 			draw.FrameRect(rt);
- 			
- 			s.left = s.right;
- 			rightEdge = s.right;
  		}
! 	}
! 	DrawHeaderButton(draw, s, kButtonCleanup, isPrinter);
! 	if(s.right < hdr.right)
! 	{
! 		rt = hdr;
  
! 		rt.left = rightEdge+1;
! 		draw.EraseRect(rt);
  	}
- 	
- 	draw.SetForeColor(KXGColorBlack);
- 	draw.ClipRect(NULL);
- 	draw.SetPenWidth(2);
- 	draw.MoveTo(hdr.left,hdr.bottom);
- 	draw.LineTo(hdr.right,hdr.bottom);
- 	draw.SetPenWidth(1);
  }
  
--- 1396,1482 ----
  	long	numColumns;
  	
! 	if(_titleHeight != 0)
  	{
! 		if(isPrinter)
! 			cr = r;
! 		else
! 			cr = GetContentRect();
! 		hdr = cr;
! 		hdr.bottom = _titleHeight;
! 		draw.ClipRect(&hdr);
  		
! 		draw.SetFontObject(_font);
! 		len = _columnTitles.GetNumStrings();
! 		s = hdr;
! 		s.left -= x;
! 		rightEdge = s.left;
! 		numColumns = _colArray.Length();
! 		
! 		DrawHeaderButton(draw, s, kButtonSetup, isPrinter);
! 		for (i = 0; i < numColumns; i++)
  		{
! 			s.right = s.left + _colArray[i]->width;
! 			
! 			if(_colArray[i]->visible && (!isPrinter || (s.right <= r.right)))
  			{
  				if(isPrinter)
+ 					draw.FillRect(s, kTableGreyColor);
+ 	#if OPT_MACOS == 0
+ 				else if(_colArray[i]->display)
+ 					draw.FillRect(s, kTableReadOnlyColor);
+ 	#endif
+ 				else
  				{
! 					DrawHeaderButton(draw, s, kButtonDrawStd, isPrinter);
  				}
! 				rt = s;
! 				if(i >= 0 && i < len)
  				{
! 					_columnTitles.GetString(i,buf);
! 					if(isPrinter)
! 					{
! 						draw.SetForeColor(KXGColorBlack);
! 						draw.SetBackColor(KXGColorWhite);
! 					}
! 					else if((i == _highlightCol) ||
! 							((i == _selCol) && (_selRow == -1)))
! 					{
! 						DrawHeaderButton(draw, s, kButtonDrawSelected, isPrinter);
! 						if(_selectColIcon != 0)
! 							draw.DrawIcon(_selectColIcon, s.right-13, s.top+3, 10, 5);
! 					}
! 					draw.MoveTo(hdr.left+3,hdr.top + draw.GetFontAscent());
! 					// Start 1/2 a font height down (mult *1.5)
! 					
! 					Rect	rtText = rt;
! 	//				rtText.top += draw.GetFontAscent();
! 					rtText.top += (_titleHeight - RGTableCell::SizeWrappedText(draw, rt, buf))/2;
! 					RGTableCell::DrawWrappedText(draw,kCenterJust,rtText,buf);
  				}
  				
! 				draw.SetForeColor(KXGColorBlack);
! 				rt.right++;
! 				draw.FrameRect(rt);
! 				
! 				s.left = s.right;
! 				rightEdge = s.right;
  			}
  		}
! 		DrawHeaderButton(draw, s, kButtonCleanup, isPrinter);
! 		if(s.right < hdr.right)
! 		{
! 			rt = hdr;
  
! 			rt.left = rightEdge+1;
! 			draw.EraseRect(rt);
! 		}
! 		
! 		draw.SetForeColor(KXGColorBlack);
! 		draw.ClipRect(NULL);
! 		draw.SetPenWidth(2);
! 		draw.MoveTo(hdr.left,hdr.bottom);
! 		draw.LineTo(hdr.right,hdr.bottom);
! 		draw.SetPenWidth(1);
  	}
  }