From 2ac032a599ef8d5066e53c928978ff29a49142fd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 29 Jun 2011 17:10:22 +0000 Subject: [PATCH] DataLoader fix for tables --- PROMS/Volian.Controls.Library/VlnFlexGrid.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 716f091d..7464db5e 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -484,7 +484,7 @@ namespace Volian.Controls.Library private int BlankColSpace() { - int curColWidth = (Cols[Col].Width == -1) ? Cols.DefaultSize - 3 : Cols[Col].Width - 3; + int curColWidth = (Cols[Col].Width == -1) ? Cols.DefaultSize - 3 : Cols[Col].Width-3; //int curRowHeightNLines = curRowHeight / (Rows.DefaultSize - 3); if (curColWidth <= Cols.DefaultSize - 3) return 0; // never have col less than default width int blankColSpace = curColWidth; @@ -496,14 +496,16 @@ namespace Volian.Controls.Library if (Col >= cr.c1 && Col <= cr.c2) { int cellWidth = GetCellWidth(r, Col); - srtb.Width = cellWidth; + //srtb.Width = cellWidth; + srtb.AdjustWidthForContent(); //Application.DoEvents(); //int mergeCellHeightNLines = cellHeight / (Rows.DefaultSize - 3); //int dataHeight = (cr.UserData == null) ? cellHeight : (int)cr.UserData; //int ud = dataHeight / (Rows.DefaultSize - 3); //if (cellHeight < dataHeight) // Console.WriteLine("r {0}, c {1}, cell{2}, data{3}", Row, c, cellHeight, dataHeight); - blankColSpace = Math.Min(blankColSpace, Math.Max(0, cellWidth - srtb.MaxTextWidth)); + //blankColSpace = Math.Min(blankColSpace, Math.Max(0, cellWidth - srtb.MaxTextWidth)); + blankColSpace = Math.Min(blankColSpace, Math.Max(0, cellWidth - srtb.Width)); } } //Console.WriteLine("BlankRowSpace {0}", blankRowSpace);