This commit is contained in:
@@ -212,6 +212,7 @@ namespace Volian.Controls.Library
|
||||
Font = formatFont;
|
||||
else
|
||||
Font = new Font(_MyFontFamily == null ? formatFont.FontFamily : _MyFontFamily, formatFont.Size, formatFont.Style);
|
||||
//Font = new Font("Bookman Old Style", formatFont.Size, formatFont.Style);
|
||||
#elif(RELEASE)
|
||||
Font = _origDisplayText.TextFont.WindowsFont; // font defined in plant's format
|
||||
#else //DEMO
|
||||
@@ -273,6 +274,8 @@ namespace Volian.Controls.Library
|
||||
// }
|
||||
//}
|
||||
_origRTF = Rtf;
|
||||
if (_MyItemInfo.ItemID == 74)
|
||||
Console.WriteLine("'{0}'", Rtf);
|
||||
_InitializingRTB = false;
|
||||
_MyItemInfo.MyConfig.PropertyChanged += new PropertyChangedEventHandler(MyConfig_PropertyChanged);
|
||||
AdjustSizeForContents(!edit); // TODO: this is not quite right yet.
|
||||
@@ -416,17 +419,22 @@ namespace Volian.Controls.Library
|
||||
void StepRTB_ContextMenuStripChanged(object sender, EventArgs e)
|
||||
{
|
||||
//Console.WriteLine("********** StepRTB_ContextMenuStripChanged");
|
||||
int sublocation = 0;
|
||||
try
|
||||
{
|
||||
Console.WriteLine("{0}", ContextMenuStrip.GetType().FullName);
|
||||
//Console.WriteLine("{0}", ContextMenuStrip.GetType().FullName);
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ClearContextMenu();
|
||||
sublocation = 1;
|
||||
_ContextMenuStripChanged = true;
|
||||
sublocation = 2;
|
||||
_ContextMenuStepRTB = this;
|
||||
sublocation = 3;
|
||||
_ContextMenuStrip = ContextMenuStrip;
|
||||
sublocation = 4;
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
Console.WriteLine("{0} - {1}", ex.GetType().Name, ex.Message);
|
||||
Console.WriteLine("StepRTB_ContextMenuStripChanged {0} - {1} [{2}]", ex.GetType().Name, ex.Message, sublocation);
|
||||
}
|
||||
}
|
||||
private void SetUpStepRTB()
|
||||
@@ -1682,8 +1690,11 @@ namespace Volian.Controls.Library
|
||||
case Keys.Enter:
|
||||
if (!e.Control && !e.Shift && !e.Alt)
|
||||
{
|
||||
e.Handled = true;
|
||||
MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey();
|
||||
if (!MyStepItem.MyItemInfo.IsTablePart)
|
||||
{
|
||||
e.Handled = true;
|
||||
MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user