This commit is contained in:
2009-06-16 14:23:01 +00:00
parent 368c85c98b
commit a17a98fe57
3 changed files with 154 additions and 19 deletions

View File

@@ -318,8 +318,8 @@ namespace Volian.Controls.Library
}
private int FindTop(int bottom)
{
int? lastBottomPrev = 0;
int? lastBottomParent = 0;
int lastBottomPrev = 0;
int lastBottomParent = 0;
if (_MyPreviousStepItem != null)
lastBottomPrev = _MyPreviousStepItem.BottomMostStepItem.Bottom;
else if(_MyParentStepItem != null)
@@ -332,6 +332,9 @@ namespace Volian.Controls.Library
// Console.WriteLine("{0}\t{1}\t{2}\t{3}\t{4}", MyID, lastBottomPrev,lastBottomParent, bottom, bottomRNO);
//if (MyID == 2125)
// Console.WriteLine("Oops!");
if (lastBottomPrev > bottom) bottom = lastBottomPrev; // RHM 20090615 ES02 Step8
// Moving from Step 8 to the Note preceeding step 8 caused the step 9 to be positioned in the wrong place.
//if (lastBottomParent > bottom) bottom = lastBottomParent;
if (bottomRNO == null) return bottom;
return (int) max(bottomRNO, bottom);
}
@@ -1354,6 +1357,14 @@ namespace Volian.Controls.Library
{
_MyStepPanel.OnAttachmentClicked(sender, new StepPanelAttachmentEventArgs(this));
}
private void _MyStepRTB_CursorKeyPress(object sender, KeyEventArgs args)
{
_MyStepPanel.StepCursorKeys(sender as StepRTB, args);
}
private void _MyStepRTB_CursorMovement(object sender, StepRTBCursorMovementEventArgs args)
{
_MyStepPanel.CursorMovement(sender as StepRTB, args.CursorLocation, args.Key);
}
#endregion // Event Handlers
#region Private Methods
/// <summary>