diff options
| author | Jeffrey Stedfast <jestedfa@microsoft.com> | 2019-11-15 18:39:37 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-11-21 18:42:53 +0300 |
| commit | b62591f4d88304119a7e6212faad44d1a7d5167f (patch) | |
| tree | febad3c004dcadf21be835e5744f4ab612547e14 /main/src/addins | |
| parent | 937b2e3cfac6d34b15c6e4f78f64b2ea22eaaaa6 (diff) | |
[Debugger] Fixed CanRename() logic for Locals/Watch context menu & allowed disabled menu items
Diffstat (limited to 'main/src/addins')
| -rw-r--r-- | main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs index f0e8816a96..60a9353317 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacObjectValueTreeView.cs @@ -918,7 +918,7 @@ namespace MonoDevelop.Debugger [CommandHandler (EditCommands.Rename)] protected void OnRename () { - if (SelectedRow == -1) + if (SelectedRowCount != 1 || SelectedRow < 0) return; var nameView = (MacDebuggerObjectNameView) GetView (0, SelectedRow, false); @@ -933,7 +933,13 @@ namespace MonoDevelop.Debugger bool CanRename (out bool enabled) { - enabled = SelectedRowCount == 1 && SelectedRow != -1; + if (SelectedRowCount == 1 && SelectedRow >= 0) { + var item = (MacObjectValueNode) ItemAtRow (SelectedRow); + + enabled = item.Target.Parent is RootObjectValueNode || item.Target is AddNewExpressionObjectValueNode; + } else { + enabled = false; + } return AllowWatchExpressions; } @@ -956,7 +962,9 @@ namespace MonoDevelop.Debugger if (row < 0) return null; - var menu = new NSMenu (); + var menu = new NSMenu { + AutoEnablesItems = false + }; bool enabled; if (CanAddWatch (out enabled)) { |