Update DTS for Grid and Content after exiting grid.
Changed property MyItemInfo to method GetMyItemInfo so that it is not saved to XML. Use new vlnFlexGrid method GetMyItemInfo.
This commit is contained in:
@@ -91,11 +91,15 @@ namespace Volian.Controls.Library
|
||||
set { _MyBorders = value; }
|
||||
}
|
||||
private ItemInfo _MyItemInfo;
|
||||
public ItemInfo MyItemInfo
|
||||
{
|
||||
get { return _MyItemInfo; }
|
||||
set { _MyItemInfo = value; }
|
||||
}
|
||||
public ItemInfo GetMyItemInfo()
|
||||
{
|
||||
return _MyItemInfo;
|
||||
}
|
||||
//public ItemInfo MyItemInfo
|
||||
//{
|
||||
// get { return _MyItemInfo; }
|
||||
// set { _MyItemInfo = value; }
|
||||
//}
|
||||
public void SetBorders(CellRange myRange,
|
||||
GridLinePattern top, GridLinePattern middle, GridLinePattern bottom,
|
||||
GridLinePattern left, GridLinePattern center, GridLinePattern right)
|
||||
@@ -535,9 +539,9 @@ namespace Volian.Controls.Library
|
||||
private static Regex _ReplaceTextFont = new Regex(@"({\\f[0-9]+[^ ]* )(?((?!VESymbFix)(?!Arial Unicode MS))([^;]*)|(!!!!))(;})");
|
||||
public void LoadGrid(ItemInfo itemInfo)
|
||||
{
|
||||
MyItemInfo = itemInfo;
|
||||
_MyItemInfo = itemInfo;
|
||||
string str = itemInfo.MyContent.MyGrid.Data;
|
||||
VE_Font vefont = MyItemInfo.GetItemFont();
|
||||
VE_Font vefont = _MyItemInfo.GetItemFont();
|
||||
FontFamily ff = StepRTB.MyFontFamily ?? vefont.WindowsFont.FontFamily; // TODO: Does not change fixed font.
|
||||
if (StepRTB.MySymbolFontName != "VESymbFix")
|
||||
str = _ReplaceVESymbFix.Replace(str, "$1" + StepRTB.MySymbolFontName + "$3");
|
||||
@@ -573,7 +577,6 @@ namespace Volian.Controls.Library
|
||||
_ReadingXml = false;
|
||||
Select(-1, -1); // this keeps the cell from being selected when the grid is first displayed
|
||||
Visible = true;
|
||||
|
||||
}
|
||||
private void SetupGrid(int numrows, int numcols) //C1FlexGrid NewGrid()
|
||||
{
|
||||
@@ -1533,7 +1536,6 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int TotalColWidths()
|
||||
{
|
||||
int cwid = 0;
|
||||
@@ -1565,7 +1567,6 @@ namespace Volian.Controls.Library
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//private void AdjustCellHeightWidth(int r, int c)
|
||||
//{
|
||||
// StepRTB trtb = new StepRTB();
|
||||
@@ -3070,7 +3071,7 @@ namespace Volian.Controls.Library
|
||||
|
||||
public void ConvertTableROToGrid(string valtext, int rodbid, string roid)
|
||||
{
|
||||
VE_Font vefont = MyItemInfo.GetItemFont();
|
||||
VE_Font vefont = _MyItemInfo.GetItemFont();
|
||||
this.Font = vefont.WindowsFont;
|
||||
this.MergedRanges.Clear();
|
||||
this.Clear();
|
||||
|
Reference in New Issue
Block a user