From eabc9324bc1f575eebb612dd4f6c7177a453214b Mon Sep 17 00:00:00 2001 From: John Date: Thu, 10 Dec 2009 18:12:24 +0000 Subject: [PATCH] Enter key logic --- PROMS/Volian.Controls.Library/StepRTB.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index bd973fdc..ffcfcee3 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -694,14 +694,12 @@ namespace Volian.Controls.Library get { StringBuilder sb = new StringBuilder(); - sb.Append(@"{\fonttbl{\f0\fnil\fcharset2 " + this.Font.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}"; + sb.Append(@"{\fonttbl{\f0\fnil\fcharset2 " + this.Font.FontFamily.Name + @";}"); if (!FontIsFixed()) sb.Append(@"{\f1\fnil\fcharset0 Arial Unicode MS;}}"); else sb.Append(@"{\f1\fnil\fcharset0 VESymbFix;}}"); return sb.ToString(); - // Match match = Regex.Match(Rtf, @"\{\\fonttbl\{.*?\}\}"); - //return match.Value; } } private string FontSize @@ -1234,6 +1232,7 @@ namespace Volian.Controls.Library } #endregion #region KeyboardHandling + void StepRTB_KeyUp(object sender, KeyEventArgs e) { if (e.Control) @@ -1339,7 +1338,6 @@ namespace Volian.Controls.Library e.Handled = true; break; case Keys.Enter: - //Console.WriteLine("Ctrl+Enter - Page Break"); this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.btnInsPgBrk_Click(sender, e); e.Handled = true; break; @@ -1512,6 +1510,13 @@ namespace Volian.Controls.Library e.SuppressKeyPress = true; e.Handled = true; break; + case Keys.Enter: + if (!e.Control && !e.Shift && !e.Alt) + { + e.Handled = true; + MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey(); + } + break; } } private void StepRTB_HomeEndPressed(KeyEventArgs keyargs) @@ -1528,7 +1533,7 @@ namespace Volian.Controls.Library //_MyStepItem.MyStepPanel.StepCursorKeys(this, keyargs); Replaced with an event OnCursorKeyPress(this, keyargs); } - private void StepRTB_ArrowPressed(E_ArrowKeys key) + public void StepRTB_ArrowPressed(E_ArrowKeys key) { Point cp = PointToClient(Cursor.Position); //_MyStepItem.MyStepPanel.CursorMovement(this, cp, key); Replaced with an event