From 291e064de013d884a1064339b149f7299e412fa1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 23 Mar 2011 16:15:25 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/VlnFlexGrid.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index d405eb6f..ff5c6cde 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -123,6 +123,13 @@ namespace Volian.Controls.Library } } + public void PasteBorders(int r, int c, int br, int bc) + { + MyBorders.HorizontalLines[r, c] = MyCopyInfo.MyCopiedFlexGrid.MyBorders.HorizontalLines[br,bc]; + MyBorders.VerticalLines[r, c] = MyCopyInfo.MyCopiedFlexGrid.MyBorders.VerticalLines[br, bc]; + MyBorders.HorizontalLines[r+1, c] = MyCopyInfo.MyCopiedFlexGrid.MyBorders.HorizontalLines[br+1, bc]; + MyBorders.VerticalLines[r, c+1] = MyCopyInfo.MyCopiedFlexGrid.MyBorders.VerticalLines[br, bc+1]; + } [XmlIgnore] public bool HasVScroll @@ -2401,6 +2408,7 @@ namespace Volian.Controls.Library { Cols.Add(colsToAdd); AdjustMergedColumns(Cols.Count - 1, false, false); + MyBorders.InsertColumns(Cols.Count - colsToAdd - 1, colsToAdd); } switch (pp) @@ -2445,6 +2453,7 @@ namespace Volian.Controls.Library MergedRanges.Add(cr); this[r + rowOffset, c] = MyCopyInfo.MyCopiedFlexGrid[r, c]; MatchStyle(crm, cr); + PasteBorders(r + rowOffset, c, r, c); } } } @@ -2489,6 +2498,7 @@ namespace Volian.Controls.Library { Rows.Add(rowsToAdd); AdjustMergedRows(Rows.Count, false, false); + MyBorders.InsertRows(Rows.Count - rowsToAdd - 1,rowsToAdd); } switch (pp) @@ -2534,6 +2544,7 @@ namespace Volian.Controls.Library MergedRanges.Add(cr); this[r, c + colOffset] = MyCopyInfo.MyCopiedFlexGrid[r, c]; MatchStyle(crm, cr); + PasteBorders(r, c + colOffset, r, c); } } } @@ -2564,6 +2575,7 @@ namespace Volian.Controls.Library this.Rows.InsertRange(selR2 + 1, rowsToAdd); else this.Rows.Add(rowsToAdd); + MyBorders.InsertRows(selR2,rowsToAdd); AdjustMergedRows(selR2 + 1, false, false); } @@ -2573,6 +2585,7 @@ namespace Volian.Controls.Library this.Cols.InsertRange(selC2 + 1, colsToAdd); else this.Cols.Add(colsToAdd); + MyBorders.InsertColumns(selC2,colsToAdd); AdjustMergedColumns(selC2 + 1, false, false); } @@ -2594,6 +2607,7 @@ namespace Volian.Controls.Library MergedRanges.Add(cr); this[r + rowOffset, c + colOffset] = MyCopyInfo.MyCopiedFlexGrid[r, c]; MatchStyle(crm, cr); + PasteBorders(r + rowOffset, c + colOffset, r, c); } } }