Fixed B2014-051: Display correct context menu for mis-spelled word’s Edit Step when in a grid cell

This commit is contained in:
Kathy Ruffing 2016-02-04 14:22:41 +00:00
parent 3dde544f71
commit d863e066ab

View File

@ -415,9 +415,14 @@ namespace Volian.Controls.Library
} }
public void OpenContextMenu(Point loc, object sender) public void OpenContextMenu(Point loc, object sender)
{ {
AddEnhancedDocumentMenu(btnCMRtfEdit,sender); if (rtabTableGridTools != null && !rtabTableGridTools.Visible)
{
AddEnhancedDocumentMenu(btnCMRtfEdit, sender);
btnCMRtfEdit.Popup(loc); btnCMRtfEdit.Popup(loc);
} }
else // in a table cell, use the table cell's context menu:
btnCMRtfCellEdit.Popup(loc);
}
private int _MyLastFormatID = -1; private int _MyLastFormatID = -1;
private StepRTB _MyStepRTB; private StepRTB _MyStepRTB;
public StepRTB MyStepRTB public StepRTB MyStepRTB
@ -438,7 +443,7 @@ namespace Volian.Controls.Library
case E_FieldToEdit.StepText: case E_FieldToEdit.StepText:
if (MyFlexGrid != null) if (MyFlexGrid != null)
{ {
// This happends when the FlexGrid (table) is slected (not when you edit a table cell) // This happends when the FlexGrid (table) is selected (not when you edit a table cell)
_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfCellEdit); _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfCellEdit);
_DefaultContextMenu = btnCMRtfCellEdit; _DefaultContextMenu = btnCMRtfCellEdit;
} }