[Igarden-commit] Garden/source/Document GerminationCell.h, 1.3.2.2, 1.3.2.3 FlexCountCell.cpp, 1.2.2.9, 1.2.2.10 FlexCountCell.h, 1.2.2.2, 1.2.2.3 GerminationCell.cpp, 1.4.2.11, 1.4.2.12

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

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

Modified Files:
      Tag: Release_branch_v1
	GerminationCell.h FlexCountCell.cpp FlexCountCell.h 
	GerminationCell.cpp 
Log Message:
Adjust existing columns widths when font is changed

Index: FlexCountCell.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/FlexCountCell.cpp,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -d -r1.2.2.9 -r1.2.2.10
*** FlexCountCell.cpp	30 Mar 2008 21:59:06 -0000	1.2.2.9
--- FlexCountCell.cpp	9 Apr 2008 03:02:04 -0000	1.2.2.10
***************
*** 150,154 ****
  	if(drawGridBack)
  		draw.EraseRect(back);
! 	draw.SetFontObject(XGFont::LoadFont(138));
  	
  	// Handle flexCount here so that we wrap the text, but not the select color
--- 150,154 ----
  	if(drawGridBack)
  		draw.EraseRect(back);
! 	draw.SetFontObject(_font);
  	
  	// Handle flexCount here so that we wrap the text, but not the select color
***************
*** 383,386 ****
--- 383,399 ----
  }
  
+ //*******************************************
+ ///	MinColumnWidth
+ //
+ short FlexCountCell::MinColumnWidth()
+ {
+ 	XGDraw	draw(_parent);
+ 	short	width = WidthOfString("XXXX", draw);
+ 	
+ 	width += kFlexMenuIconWidth + 5;
+ 	return width;
+ }
+ 
+ 
  #pragma mark FlexCountSpecific
  

Index: GerminationCell.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/GerminationCell.cpp,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -C2 -d -r1.4.2.11 -r1.4.2.12
*** GerminationCell.cpp	30 Mar 2008 21:59:09 -0000	1.4.2.11
--- GerminationCell.cpp	9 Apr 2008 03:02:07 -0000	1.4.2.12
***************
*** 174,178 ****
  				MarkReadOnly(draw, back, backColor);
  			draw.SetForeColor(_textColor);
! 			draw.SetFontObject(XGFont::LoadFont(138));
  			
  			// Handle flexCount here so that we wrap the text, but not the select color
--- 174,178 ----
  				MarkReadOnly(draw, back, backColor);
  			draw.SetForeColor(_textColor);
! 			draw.SetFontObject(_font);
  			
  			// Handle flexCount here so that we wrap the text, but not the select color
***************
*** 247,250 ****
--- 247,259 ----
  }
  
+ //*******************************************
+ ///	MinColumnWidth
+ //
+ short GerminationCell::MinColumnWidth()
+ {
+ 	XGDraw	draw(_parent);
+ 	return WidthOfString("88/88/8888,100%", draw);
+ }
+ 
  #pragma mark Cell-specific calls
  

Index: GerminationCell.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/GerminationCell.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -d -r1.3.2.2 -r1.3.2.3
*** GerminationCell.h	30 Mar 2008 21:59:03 -0000	1.3.2.2
--- GerminationCell.h	9 Apr 2008 03:02:04 -0000	1.3.2.3
***************
*** 41,44 ****
--- 41,45 ----
  	virtual	long	ComputeCellHeight(XGDraw& draw);
  	virtual bool	EditSelectItem(bool doPopup, Point *where);
+ 	virtual short	MinColumnWidth();
  		
  	void			SetGerminationData(InstanceData *clientData, const char *data);

Index: FlexCountCell.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/FlexCountCell.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** FlexCountCell.h	30 Mar 2008 21:59:16 -0000	1.2.2.2
--- FlexCountCell.h	9 Apr 2008 03:02:06 -0000	1.2.2.3
***************
*** 44,47 ****
--- 44,48 ----
  	virtual	long	ComputeCellHeight(XGDraw& draw);
  	virtual bool	EditSelectItem(bool doPopup, Point *where);
+ 	virtual short	MinColumnWidth();
  		
  	void		SetFlexCount(FlexCount &count);