- Bug Fix - Update RNO tab when AER tab is updated

- Commented-Out debug for location
- Bug Fix - Cautions are now added above existing notes
Bug Fix - AdjustSizeForContents - Only adjust width if text != ""
This commit is contained in:
Rich
2010-01-08 14:33:04 +00:00
parent 843c3fc85a
commit ec1d6f9bd2
2 changed files with 23 additions and 15 deletions

View File

@@ -342,7 +342,7 @@ namespace Volian.Controls.Library
public StepRTB()
{
InitializeComponent();
SetUp();
SetUpStepRTB();
AddEventHandlers();
}
public StepRTB(IContainer container)
@@ -350,7 +350,7 @@ namespace Volian.Controls.Library
container.Add(this);
InitializeComponent();
_Container = container;
SetUp();
SetUpStepRTB();
AddEventHandlers();
}
protected override void OnMouseWheel(MouseEventArgs e)
@@ -386,7 +386,7 @@ namespace Volian.Controls.Library
this.MouseLeave += new EventHandler(StepRTB_MouseLeave);
this.SelectionChanged +=new EventHandler(StepRTB_SelectionChanged);
}
private void SetUp()
private void SetUpStepRTB()
{
this.Height = 10; // initialize the height to 10, the default height was too big for the cells in grid tables
BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -808,7 +808,8 @@ namespace Volian.Controls.Library
Size offset = Size - ClientSize;
int widthNew = ContentsSize.Width + offset.Width + AdjustSize.Width ;
int heightNew = ContentsSize.Height + offset.Height + AdjustSize.Height;
Size szNew = new Size((adjustWidth ? widthNew : (widthNew > Width ? widthNew : Width)), heightNew);
// Don't make the window narrower unless it has text - RHM - 20100107
Size szNew = new Size(((Text != "" && adjustWidth) ? widthNew : (widthNew > Width ? widthNew : Width)), heightNew);
if (this.Size != szNew)
{
this.Size = szNew;