From d863e066ab8ef6893487b6b37c3a0192e3dd8cc0 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 4 Feb 2016 14:22:41 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20B2014-051:=20=20Display=20correct=20con?= =?UTF-8?q?text=20menu=20for=20mis-spelled=20word=E2=80=99s=20Edit=20Step?= =?UTF-8?q?=20when=20in=20a=20grid=20cell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index caebf942..4c119556 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -415,8 +415,13 @@ namespace Volian.Controls.Library } public void OpenContextMenu(Point loc, object sender) { - AddEnhancedDocumentMenu(btnCMRtfEdit,sender); - btnCMRtfEdit.Popup(loc); + if (rtabTableGridTools != null && !rtabTableGridTools.Visible) + { + AddEnhancedDocumentMenu(btnCMRtfEdit, sender); + btnCMRtfEdit.Popup(loc); + } + else // in a table cell, use the table cell's context menu: + btnCMRtfCellEdit.Popup(loc); } private int _MyLastFormatID = -1; private StepRTB _MyStepRTB; @@ -438,7 +443,7 @@ namespace Volian.Controls.Library case E_FieldToEdit.StepText: 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); _DefaultContextMenu = btnCMRtfCellEdit; }