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

Debug output save and show

Browse Source 
Added StepRTB Closed logic to disposing
Use the correct font for sections and procedures.
This commit is contained in:
Rich
2011-08-23 18:42:34 +00:00
parent fab3c49244
commit 719706350b
4 changed files with 99 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PROMS/Volian.Controls.Library/DisplayHistory.cs
View File

@@ -787,7 +787,7 @@ namespace Volian.Controls.Library
myVFG.Visible = false;
// myRTB.Font = new Font("Arial", 12, FontStyle.Regular);
// myRTB.Text = cai.Text;
myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData.Font);
myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font);
}
}
if (tn.Tag is ItemAuditInfo)
@@ -801,13 +801,7 @@ namespace Volian.Controls.Library
{
//myRTB.Font = new Font("Arial", 12, FontStyle.Regular);
//myRTB.Text = cai.Text;
if (MyItemInfo.FormatStepData != null)
myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData.Font);
else
{
myRTB.SetupRichText(cai.Text, new VE_Font(StepRTB.MyFontFamily != null ? StepRTB.MyFontFamily.Name : "arial", 12, E_Style.None, 8));
}
myRTB.SetupRichText(cai.Text, MyItemInfo.FormatStepData == null ? MyItemInfo.ActiveFormat.PlantFormat.FormatData.Font : MyItemInfo.FormatStepData.Font);
}
}
}

2
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@@ -540,7 +540,7 @@ namespace Volian.Controls.Library
}
public void HideCaret()
{
if (_MyStepRTB != null && ! _MyStepRTB.Disposing)
if (_MyStepRTB != null && !_MyStepRTB.Disposing && !_MyStepRTB.Closed)
{
if (_MyStepRTB.SelectionLength == 0)
{

2
PROMS/Volian.Controls.Library/RTBItem.cs
View File

@@ -646,7 +646,7 @@ namespace Volian.Controls.Library
public override void ItemSelect()
{
// Was getting an Error that _MyStepRTB was Disposed RHM 20101217
if (!_MyStepRTB.Disposing)
if (!_MyStepRTB.Disposing && !MyStepRTB.Closed)
{
_MyStepRTB.Focus();
_MyStepRTB.Select(0, 0);