Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2011-03-07 13:20:00 +00:00
parent c04a3a165b
commit 8f5b541aca
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -1395,18 +1395,21 @@ namespace Volian.Controls.Library
TablePicker tpdlg = new TablePicker(); TablePicker tpdlg = new TablePicker();
tpdlg.Location = pt; tpdlg.Location = pt;
tpdlg.Left = left; tpdlg.Left = left;
tpdlg.Show(); DialogResult dr = tpdlg.ShowDialog();
while (tpdlg.Visible) while (tpdlg.Visible)
{ {
Application.DoEvents(); Application.DoEvents();
System.Threading.Thread.Sleep(0); System.Threading.Thread.Sleep(0);
} }
if (!tpdlg.Cancel) if (dr != DialogResult.Cancel) //!tpdlg.Cancel)
{ {
// Create a new grid to store the selected size // Create a new grid to store the selected size
grd = new VlnFlexGrid(); grd = new VlnFlexGrid();
grd.Rows.Count = tpdlg.SelectedRows; grd.Rows.Count = tpdlg.SelectedRows;
grd.Cols.Count = tpdlg.SelectedColumns; grd.Cols.Count = tpdlg.SelectedColumns;
VE_Font vefont = MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Table.Font;
Font GridFont = new Font(vefont.Family, (float)vefont.Size);
grd.Font = GridFont;
} }
return grd; return grd;
} }

14
PROMS/Volian.Controls.Library/VlnFlexGrid.cs
View File

@ -581,7 +581,15 @@ namespace Volian.Controls.Library
e.Style.BackColor = solid; e.Style.BackColor = solid;
// check whether the cell contains RTF // check whether the cell contains RTF
string rtfText = this.GetDataDisplay(e.Row, e.Col).Replace(@"\~",@"\u160?"); // TODO: Can we do DisplayText() in here??
//DisplayText(ItemInfo itemInfo, string text, bool colorLinks)
string rtfText = this.GetDataDisplay(e.Row, e.Col).Replace(@"\~", @"\u160?");
GridItem gi = Parent as GridItem;
if (gi != null)
{
DisplayText dt = new DisplayText(gi.MyItemInfo, rtfText, true);
rtfText = dt.StartText;
}
if (rtfText.StartsWith(@"{\rtf")) if (rtfText.StartsWith(@"{\rtf"))
{ {
// it does, so draw background // it does, so draw background
@ -2160,9 +2168,9 @@ namespace Volian.Controls.Library
if (this[r, c] != null) if (this[r, c] != null)
{ {
string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]); string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]);
sb.Append(strp.Replace(@"\r\n", " ")); sb.Append(strp.Replace("\r\n", " "));
} }
sb.Append(@"\r\n"); sb.Append("\r\n");
} }
c = c + 1; c = c + 1;
if (c == w) if (c == w)